busybox: version bump 1.31.1 -> 1.35.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

19 files changed, 493 insertions, 384 deletions

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index e822221c9..199cc6ab2 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -156,12 +156,13 @@ config BUSYBOX_FEATURE_PIDFILE
 config BUSYBOX_PID_FILE_PATH
 	string "Directory for pidfiles"
 	default "/var/run"
-	depends on BUSYBOX_FEATURE_PIDFILE
+	depends on BUSYBOX_FEATURE_PIDFILE || BUSYBOX_FEATURE_CROND_SPECIAL_TIMES
 	help
 	This is the default path where pidfiles are created.  Applets which
 	allow you to set the pidfile path on the command line will override
 	this value.  The option has no effect on applets that require you to
-	specify a pidfile path.
+	specify a pidfile path.  When crond has the 'Support special times'
+	option enabled, the 'crond.reboot' file is also stored here.
 
 config BUSYBOX_BUSYBOX
 	bool "Include busybox applet"
@@ -311,7 +312,6 @@ config BUSYBOX_BUSYBOX_EXEC_PATH
 config BUSYBOX_SELINUX
 	bool "Support NSA Security Enhanced Linux"
 	default n
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Enable support for SELinux in applets ls, ps, and id. Also provide
 	the option of compiling in SELinux applets.
@@ -357,17 +357,6 @@ config BUSYBOX_FEATURE_SYSLOG
 	#This option is auto-selected when you select any applet which may
 	#send its output to syslog. You do not need to select it manually.
 
-config BUSYBOX_PLATFORM_LINUX
-	bool #No description makes it a hidden option
-	default n
-	#help
-	#For the most part, busybox requires only POSIX compatibility
-	#from the target system, but some applets and features use
-	#Linux-specific interfaces.
-	#
-	#This is automatically selected if any applet or feature requires
-	#Linux-specific interfaces. You do not need to select it manually.
-
 comment 'Build Options'
 
 config BUSYBOX_STATIC
@@ -540,6 +529,14 @@ config BUSYBOX_STACK_OPTIMIZATION_386
 	do not work with it (they use SSE instructions without
 	ensuring stack alignment).
 
+config BUSYBOX_STATIC_LIBGCC
+	bool "Use -static-libgcc"
+	default y
+	help
+	This option instructs gcc to link in a static version of its
+	support library, libgcc. This means that the binary will require
+	one fewer dynamic library at run time.
+
 comment 'Installation Options ("make install" behavior)'
 
 choice
@@ -661,6 +658,19 @@ config BUSYBOX_WERROR
 
 	Most people should answer N.
 
+config BUSYBOX_WARN_SIMPLE_MSG
+	bool "Warn about single parameter bb_xx_msg calls"
+	default n
+	help
+	This will cause warnings to be shown for any instances of
+	bb_error_msg(), bb_error_msg_and_die(), bb_perror_msg(),
+	bb_perror_msg_and_die(), bb_herror_msg() or bb_herror_msg_and_die()
+	being called with a single parameter. In these cases the equivalent
+	bb_simple_xx_msg function should be used instead.
+	Note that use of STRERROR_FMT may give false positives.
+
+	If you aren't developing busybox, say N here.
+
 choice
 	prompt "Additional debugging library"
 	default BUSYBOX_NO_DEBUG_LIB
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index 32024bc6a..ca0499a75 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -204,6 +204,20 @@ config BUSYBOX_FEATURE_CPIO_P
 	depends on BUSYBOX_FEATURE_CPIO_O
 	help
 	Passthrough mode. Rarely used.
+
+config BUSYBOX_FEATURE_CPIO_IGNORE_DEVNO
+	bool "Support --ignore-devno like GNU cpio"
+	default y
+	depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS
+	help
+	Optionally ignore device numbers when creating archives.
+
+config BUSYBOX_FEATURE_CPIO_RENUMBER_INODES
+	bool "Support --renumber-inodes like GNU cpio"
+	default y
+	depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS
+	help
+	Optionally renumber inodes when creating archives.
 config BUSYBOX_DPKG
 	bool "dpkg (43 kb)"
 	default y
@@ -256,7 +270,7 @@ config BUSYBOX_FEATURE_GZIP_LEVELS
 	help
 	Enable support for compression levels 4-9. The default level
 	is 6. If levels 1-3 are specified, 4 is used.
-	If this option is not selected, -N options are ignored and -9
+	If this option is not selected, -N options are ignored and -6
 	is used.
 
 config BUSYBOX_FEATURE_GZIP_DECOMPRESS
diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in
index e67bb61ed..d0e43ca43 100644
--- a/config/busybox/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -9,7 +9,6 @@ menu "Console Utilities"
 config BUSYBOX_CHVT
 	bool "chvt (2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program is used to change to another terminal.
 	Example: chvt 4 (change to terminal /dev/tty4)
@@ -21,39 +20,33 @@ config BUSYBOX_CLEAR
 config BUSYBOX_DEALLOCVT
 	bool "deallocvt (1.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program deallocates unused virtual consoles.
 config BUSYBOX_DUMPKMAP
 	bool "dumpkmap (1.6 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program dumps the kernel's keyboard translation table to
 	stdout, in binary format. You can then use loadkmap to load it.
 config BUSYBOX_FGCONSOLE
 	bool "fgconsole (1.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program prints active (foreground) console number.
 config BUSYBOX_KBD_MODE
 	bool "kbd_mode (4.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program reports and sets keyboard mode.
 config BUSYBOX_LOADFONT
 	bool "loadfont (5.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program loads a console font from standard input.
 
 config BUSYBOX_SETFONT
 	bool "setfont (24 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Allows to load console screen map. Useful for i18n.
 
@@ -87,14 +80,12 @@ config BUSYBOX_FEATURE_LOADFONT_RAW
 config BUSYBOX_LOADKMAP
 	bool "loadkmap (1.8 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program loads a keyboard translation table from
 	standard input.
 config BUSYBOX_OPENVT
 	bool "openvt (7.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program is used to start a command on an unused
 	virtual terminal.
@@ -123,7 +114,6 @@ config BUSYBOX_FEATURE_RESIZE_PRINT
 config BUSYBOX_SETCONSOLE
 	bool "setconsole (3.6 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Redirect writes to /dev/console to another device,
 	like the current tty while logged in via telnet.
@@ -137,20 +127,17 @@ config BUSYBOX_FEATURE_SETCONSOLE_LONG_OPTIONS
 config BUSYBOX_SETKEYCODES
 	bool "setkeycodes (2.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program loads entries into the kernel's scancode-to-keycode
 	map, allowing unusual keyboards to generate usable keycodes.
 config BUSYBOX_SETLOGCONS
 	bool "setlogcons (1.8 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This program redirects the output console of kernel messages.
 config BUSYBOX_SHOWKEY
 	bool "showkey (4.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Shows keys pressed.
 
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 5b322885a..8c9e66e17 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -6,6 +6,47 @@
 
 menu "Coreutils"
 
+config BUSYBOX_FEATURE_VERBOSE
+	bool "Support verbose options (usually -v) for various applets"
+	default y
+	help
+	Enable cp -v, rm -v and similar messages.
+	Also enables long option (--verbose) if it exists.
+	Without this option, -v is accepted but ignored.
+
+comment "Common options for date and touch"
+
+config BUSYBOX_FEATURE_TIMEZONE
+	bool "Allow timezone in dates"
+	default y
+	depends on BUSYBOX_DESKTOP
+	help
+	Permit the use of timezones when parsing user-provided data
+	strings, e.g. '1996-04-09 12:45:00 -0500'.
+
+	This requires support for the '%z' extension to strptime() which
+	may not be available in all implementations.
+
+comment "Common options for cp and mv"
+	depends on BUSYBOX_CP || BUSYBOX_MV
+
+config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
+	bool "Preserve hard links"
+	default y
+	depends on BUSYBOX_CP || BUSYBOX_MV
+	help
+	Allow cp and mv to preserve hard links.
+
+comment "Common options for df, du, ls"
+	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
+
+config BUSYBOX_FEATURE_HUMAN_READABLE
+	bool "Support human readable output (example 13k, 23M, 235G)"
+	default y
+	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
+	help
+	Allow df, du, and ls to have human readable output.
+
 config BUSYBOX_BASENAME
 	bool "basename (438 bytes)"
 	default y
@@ -63,8 +104,10 @@ config BUSYBOX_CHROOT
 config BUSYBOX_CKSUM
 	bool "cksum (4.1 kb)"
 	default y
-	help
-	cksum is used to calculate the CRC32 checksum of a file.
+
+config BUSYBOX_CRC32
+	bool "crc32 (4.1 kb)"
+	default y
 config BUSYBOX_COMM
 	bool "comm (4.2 kb)"
 	default y
@@ -95,6 +138,13 @@ config BUSYBOX_CUT
 	help
 	cut is used to print selected parts of lines from
 	each file to stdout.
+
+config BUSYBOX_FEATURE_CUT_REGEX
+	bool "cut -F"
+	default y
+	depends on BUSYBOX_CUT
+	help
+	Allow regex based delimiters.
 config BUSYBOX_DATE
 	bool "date (7 kb)"
 	default y
@@ -110,12 +160,10 @@ config BUSYBOX_FEATURE_DATE_ISOFMT
 	Enable option (-I) to output an ISO-8601 compliant
 	date/time string.
 
-# defaults to "no": stat's nanosecond field is a bit non-portable
 config BUSYBOX_FEATURE_DATE_NANO
 	bool "Support %[num]N nanosecond format specifier"
-	default n  # syscall(__NR_clock_gettime)
+	default n # stat's nanosecond field is a bit non-portable
 	depends on BUSYBOX_DATE
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Support %[num]N format specifier. Adds ~250 bytes of code.
 
@@ -193,6 +241,26 @@ config BUSYBOX_FEATURE_DF_FANCY
 	-a Show all filesystems
 	-i Inodes
 	-B <SIZE> Blocksize
+
+config BUSYBOX_FEATURE_SKIP_ROOTFS
+	bool "Skip rootfs in mount table"
+	default y
+	depends on BUSYBOX_DF
+	help
+	Ignore rootfs entry in mount table.
+
+	In Linux, kernel has a special filesystem, rootfs, which is initially
+	mounted on /. It contains initramfs data, if kernel is configured
+	to have one. Usually, another file system is mounted over / early
+	in boot process, and therefore most tools which manipulate
+	mount table, such as df, will skip rootfs entry.
+
+	However, some systems do not mount anything on /.
+	If you need to configure busybox for one of these systems,
+	you may find it useful to turn this option off to make df show
+	initramfs statistics.
+
+	Otherwise, choose Y.
 config BUSYBOX_DIRNAME
 	bool "dirname (329 bytes)"
 	default y
@@ -636,7 +704,6 @@ config BUSYBOX_FEATURE_STAT_FILESYSTEM
 	bool "Enable display of filesystem status (-f)"
 	default y
 	depends on BUSYBOX_STAT
-	select BUSYBOX_PLATFORM_LINUX # statfs()
 	help
 	Without this, stat will not support the '-f' option to display
 	information about filesystem status.
@@ -742,16 +809,8 @@ config BUSYBOX_TOUCH
 	touch is used to create or change the access and/or
 	modification timestamp of specified files.
 
-config BUSYBOX_FEATURE_TOUCH_NODEREF
-	bool "Add support for -h"
-	default y
-	depends on BUSYBOX_TOUCH
-	help
-	Enable touch to have the -h option.
-	This requires libc support for lutimes() function.
-
 config BUSYBOX_FEATURE_TOUCH_SUSV3
-	bool "Add support for SUSV3 features (-d -t -r)"
+	bool "Add support for SUSV3 features (-a -d -m -t -r)"
 	default y
 	depends on BUSYBOX_TOUCH
 	help
@@ -837,6 +896,11 @@ config BUSYBOX_UUDECODE
 	default y
 	help
 	uudecode is used to decode a uuencoded file.
+config BUSYBOX_BASE32
+	bool "base32 (4.9 kb)"
+	default y
+	help
+	Base32 encode and decode
 config BUSYBOX_BASE64
 	bool "base64 (4.9 kb)"
 	default y
@@ -893,34 +957,4 @@ config BUSYBOX_YES
 	yes is used to repeatedly output a specific string, or
 	the default string 'y'.
 
-comment "Common options"
-
-config BUSYBOX_FEATURE_VERBOSE
-	bool "Support verbose options (usually -v) for various applets"
-	default y
-	help
-	Enable cp -v, rm -v and similar messages.
-	Also enables long option (--verbose) if it exists.
-	Without this option, -v is accepted but ignored.
-
-comment "Common options for cp and mv"
-	depends on BUSYBOX_CP || BUSYBOX_MV
-
-config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
-	bool "Preserve hard links"
-	default y
-	depends on BUSYBOX_CP || BUSYBOX_MV
-	help
-	Allow cp and mv to preserve hard links.
-
-comment "Common options for df, du, ls"
-	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
-
-config BUSYBOX_FEATURE_HUMAN_READABLE
-	bool "Support human readable output (example 13k, 23M, 235G)"
-	default y
-	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
-	help
-	Allow df, du, and ls to have human readable output.
-
 endmenu
diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in
index fc660f486..2abc80f96 100644
--- a/config/busybox/e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/Config.in
@@ -21,7 +21,6 @@ config BUSYBOX_FSCK
 config BUSYBOX_LSATTR
 	bool "lsattr (5.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	lsattr lists the file attributes on a second extended file system.
 config BUSYBOX_TUNE2FS
diff --git a/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 3e48e371d..2858f60d1 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -110,6 +110,14 @@ config BUSYBOX_FEATURE_VI_COLON
 	Enable a limited set of colon commands. This does not
 	provide an "ex" mode.
 
+config BUSYBOX_FEATURE_VI_COLON_EXPAND
+	bool "Expand \"%\" and \"#\" in colon commands"
+	default y
+	depends on BUSYBOX_FEATURE_VI_COLON
+	help
+	Expand the special characters \"%\" (current filename)
+	and \"#\" (alternate filename) in colon commands.
+
 config BUSYBOX_FEATURE_VI_YANKMARK
 	bool "Enable yank/put commands and mark cmds"
 	default y
@@ -217,6 +225,14 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
 	Unless you want more (or less) frequent "undo points" while typing,
 	you should probably leave this unchanged.
 
+config BUSYBOX_FEATURE_VI_VERBOSE_STATUS
+	bool "Enable verbose status reporting"
+	default y
+	depends on BUSYBOX_VI
+	help
+	Enable more verbose reporting of the results of yank, change,
+	delete, undo and substitution commands.
+
 config BUSYBOX_FEATURE_ALLOW_EXEC
 	bool "Allow vi and awk to execute shell commands"
 	default y
diff --git a/config/busybox/findutils/Config.in b/config/busybox/findutils/Config.in
index 92e676670..d4aa403a5 100644
--- a/config/busybox/findutils/Config.in
+++ b/config/busybox/findutils/Config.in
@@ -23,21 +23,53 @@ config BUSYBOX_FEATURE_FIND_PRINT0
 	interpreted by other programs.
 
 config BUSYBOX_FEATURE_FIND_MTIME
-	bool "Enable -mtime: modified time matching"
+	bool "Enable -mtime: modification time matching"
 	default y
 	depends on BUSYBOX_FIND
 	help
 	Allow searching based on the modification time of
 	files, in days.
 
+config BUSYBOX_FEATURE_FIND_ATIME
+	bool "Enable -atime: access time matching"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MTIME
+	help
+	Allow searching based on the access time of
+	files, in days.
+
+config BUSYBOX_FEATURE_FIND_CTIME
+	bool "Enable -ctime: status change timestamp matching"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MTIME
+	help
+	Allow searching based on the status change timestamp of
+	files, in days.
+
 config BUSYBOX_FEATURE_FIND_MMIN
-	bool "Enable -mmin: modified time matching by minutes"
+	bool "Enable -mmin: modification time matching by minutes"
 	default y
 	depends on BUSYBOX_FIND
 	help
 	Allow searching based on the modification time of
 	files, in minutes.
 
+config BUSYBOX_FEATURE_FIND_AMIN
+	bool "Enable -amin: access time matching by minutes"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MMIN
+	help
+	Allow searching based on the access time of
+	files, in minutes.
+
+config BUSYBOX_FEATURE_FIND_CMIN
+	bool "Enable -cmin: status change timestamp matching by minutes"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MMIN
+	help
+	Allow searching based on the status change timestamp of
+	files, in minutes.
+
 config BUSYBOX_FEATURE_FIND_PERM
 	bool "Enable -perm: permissions matching"
 	default y
@@ -79,6 +111,13 @@ config BUSYBOX_FEATURE_FIND_INUM
 	default y
 	depends on BUSYBOX_FIND
 
+config BUSYBOX_FEATURE_FIND_SAMEFILE
+	bool "Enable -samefile: reference file matching"
+	default y
+	depends on BUSYBOX_FIND
+	help
+	Support the 'find -samefile' option for searching by a reference file.
+
 config BUSYBOX_FEATURE_FIND_EXEC
 	bool "Enable -exec: execute commands"
 	default y
@@ -159,6 +198,14 @@ config BUSYBOX_FEATURE_FIND_DELETE
 	WARNING: This option can do much harm if used wrong. Busybox will not
 	try to protect the user from doing stupid things. Use with care.
 
+config BUSYBOX_FEATURE_FIND_EMPTY
+	bool "Enable -empty: match empty files or directories"
+	default y
+	depends on BUSYBOX_FIND
+	help
+	Support the 'find -empty' option to find empty regular files
+	or directories.
+
 config BUSYBOX_FEATURE_FIND_PATH
 	bool "Enable -path: match pathname with shell pattern"
 	default y
diff --git a/config/busybox/klibc-utils/Config.in b/config/busybox/klibc-utils/Config.in
index 8121e605f..f2ff057fb 100644
--- a/config/busybox/klibc-utils/Config.in
+++ b/config/busybox/klibc-utils/Config.in
@@ -13,7 +13,7 @@ config BUSYBOX_MINIPS
 	Alias to "ps".
 config BUSYBOX_NUKE
 	bool "nuke (2.9 kb)"
-	default y
+	default n  # off by default: too "accidentally destructive"
 	help
 	Alias to "rm -rf".
 config BUSYBOX_RESUME
@@ -24,7 +24,6 @@ config BUSYBOX_RESUME
 config BUSYBOX_RUN_INIT
 	bool "run-init (7.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The run-init utility is used from initramfs to select a new
 	root device. Under initramfs, you have to use this instead of
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 84bed23ea..8e4fe855e 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -117,32 +117,73 @@ config BUSYBOX_SHA3_SMALL
 	64-bit x86: +270 bytes of code, 45% faster
 	32-bit x86: +450 bytes of code, 75% faster
 
-config BUSYBOX_FEATURE_FAST_TOP
-	bool "Faster /proc scanning code (+100 bytes)"
-	default n  # all "fast or small" options default to small
+config BUSYBOX_FEATURE_NON_POSIX_CP
+	bool "Non-POSIX, but safer, copying to special nodes"
+	default y
 	help
-	This option makes top and ps ~20% faster (or 20% less CPU hungry),
-	but code size is slightly bigger.
+	With this option, "cp file symlink" will delete symlink
+	and create a regular file. This does not conform to POSIX,
+	but prevents a symlink attack.
+	Similarly, "cp file device" will not send file's data
+	to the device. (To do that, use "cat file >device")
 
-config BUSYBOX_FEATURE_ETC_NETWORKS
-	bool "Support /etc/networks"
+config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
+	bool "Give more precise messages when copy fails (cp, mv etc)"
 	default n
 	help
-	Enable support for network names in /etc/networks. This is
-	a rarely used feature which allows you to use names
-	instead of IP/mask pairs in route command.
+	Error messages with this feature enabled:
 
-config BUSYBOX_FEATURE_ETC_SERVICES
-	bool "Consult /etc/services even for well-known ports"
-	default n
+	$ cp file /does_not_exist/file
+	cp: cannot create '/does_not_exist/file': Path does not exist
+	$ cp file /vmlinuz/file
+	cp: cannot stat '/vmlinuz/file': Path has non-directory component
+
+	If this feature is not enabled, they will be, respectively:
+
+	cp: cannot create '/does_not_exist/file': No such file or directory
+	cp: cannot stat '/vmlinuz/file': Not a directory
+
+	This will cost you ~60 bytes.
+
+config BUSYBOX_FEATURE_USE_SENDFILE
+	bool "Use sendfile system call"
+	default y
+	help
+	When enabled, busybox will use the kernel sendfile() function
+	instead of read/write loops to copy data between file descriptors
+	(for example, cp command does this a lot).
+	If sendfile() doesn't work, copying code falls back to read/write
+	loop. sendfile() was originally implemented for faster I/O
+	from files to sockets, but since Linux 2.6.33 it was extended
+	to work for many more file types.
+
+config BUSYBOX_FEATURE_COPYBUF_KB
+	int "Copy buffer size, in kilobytes"
+	range 1 1024
+	default 4
 	help
-	Look up e.g. "telnet" and "http" in /etc/services file
-	instead of assuming ports 23 and 80.
-	This is almost never necessary (everybody uses standard ports),
-	and it makes sense to avoid reading this file.
-	If you disable this option, in the cases where port is explicitly
-	specified as a service name (e.g. "telnet HOST PORTNAME"),
-	it will still be looked up in /etc/services.
+	Size of buffer used by cp, mv, install, wget etc.
+	Buffers which are 4 kb or less will be allocated on stack.
+	Bigger buffers will be allocated with mmap, with fallback to 4 kb
+	stack buffer if mmap fails.
+
+config BUSYBOX_MONOTONIC_SYSCALL
+	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
+	default y
+	help
+	Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+	time intervals (time, ping, traceroute etc need this).
+	Probably requires Linux 2.6+. If not selected, gettimeofday
+	will be used instead (which gives wrong results if date/time
+	is reset).
+
+config BUSYBOX_IOCTL_HEX2STR_ERROR
+	bool "Use ioctl names rather than hex values in error messages"
+	default y
+	help
+	Use ioctl names rather than hex values in error messages
+	(e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+	saves about 1400 bytes.
 
 config BUSYBOX_FEATURE_EDITING
 	bool "Command line editing"
@@ -358,98 +399,3 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
 	For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
 	at shell prompt will list file named 0xff (single char name
 	with char value 255), not file named '?'.
-
-config BUSYBOX_FEATURE_NON_POSIX_CP
-	bool "Non-POSIX, but safer, copying to special nodes"
-	default y
-	help
-	With this option, "cp file symlink" will delete symlink
-	and create a regular file. This does not conform to POSIX,
-	but prevents a symlink attack.
-	Similarly, "cp file device" will not send file's data
-	to the device. (To do that, use "cat file >device")
-
-config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
-	bool "Give more precise messages when copy fails (cp, mv etc)"
-	default n
-	help
-	Error messages with this feature enabled:
-
-	$ cp file /does_not_exist/file
-	cp: cannot create '/does_not_exist/file': Path does not exist
-	$ cp file /vmlinuz/file
-	cp: cannot stat '/vmlinuz/file': Path has non-directory component
-
-	If this feature is not enabled, they will be, respectively:
-
-	cp: cannot create '/does_not_exist/file': No such file or directory
-	cp: cannot stat '/vmlinuz/file': Not a directory
-
-	This will cost you ~60 bytes.
-
-config BUSYBOX_FEATURE_USE_SENDFILE
-	bool "Use sendfile system call"
-	default y
-	select BUSYBOX_PLATFORM_LINUX
-	help
-	When enabled, busybox will use the kernel sendfile() function
-	instead of read/write loops to copy data between file descriptors
-	(for example, cp command does this a lot).
-	If sendfile() doesn't work, copying code falls back to read/write
-	loop. sendfile() was originally implemented for faster I/O
-	from files to sockets, but since Linux 2.6.33 it was extended
-	to work for many more file types.
-
-config BUSYBOX_FEATURE_COPYBUF_KB
-	int "Copy buffer size, in kilobytes"
-	range 1 1024
-	default 4
-	help
-	Size of buffer used by cp, mv, install, wget etc.
-	Buffers which are 4 kb or less will be allocated on stack.
-	Bigger buffers will be allocated with mmap, with fallback to 4 kb
-	stack buffer if mmap fails.
-
-config BUSYBOX_FEATURE_SKIP_ROOTFS
-	bool "Skip rootfs in mount table"
-	default y
-	help
-	Ignore rootfs entry in mount table.
-
-	In Linux, kernel has a special filesystem, rootfs, which is initially
-	mounted on /. It contains initramfs data, if kernel is configured
-	to have one. Usually, another file system is mounted over / early
-	in boot process, and therefore most tools which manipulate
-	mount table, such as df, will skip rootfs entry.
-
-	However, some systems do not mount anything on /.
-	If you need to configure busybox for one of these systems,
-	you may find it useful to turn this option off to make df show
-	initramfs statistics.
-
-	Otherwise, choose Y.
-
-config BUSYBOX_MONOTONIC_SYSCALL
-	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
-	default y
-	select BUSYBOX_PLATFORM_LINUX
-	help
-	Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
-	time intervals (time, ping, traceroute etc need this).
-	Probably requires Linux 2.6+. If not selected, gettimeofday
-	will be used instead (which gives wrong results if date/time
-	is reset).
-
-config BUSYBOX_IOCTL_HEX2STR_ERROR
-	bool "Use ioctl names rather than hex values in error messages"
-	default y
-	help
-	Use ioctl names rather than hex values in error messages
-	(e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
-	saves about 1400 bytes.
-
-config BUSYBOX_FEATURE_HWIB
-	bool "Support infiniband HW"
-	default y
-	help
-	Support for printing infiniband addresses in network applets.
diff --git a/config/busybox/mailutils/Config.in b/config/busybox/mailutils/Config.in
index 1b793ef7c..29890dcbd 100644
--- a/config/busybox/mailutils/Config.in
+++ b/config/busybox/mailutils/Config.in
@@ -1,6 +1,13 @@
 # DO NOT EDIT. This file is generated from Config.src
 menu "Mail Utilities"
 
+config BUSYBOX_FEATURE_MIME_CHARSET
+	string "Default charset"
+	default "us-ascii"
+	depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
+	help
+	Default charset of the message.
+
 config BUSYBOX_MAKEMIME
 	bool "makemime (5.4 kb)"
 	default y
@@ -41,11 +48,4 @@ config BUSYBOX_SENDMAIL
 	help
 	Barebones sendmail.
 
-config BUSYBOX_FEATURE_MIME_CHARSET
-	string "Default charset"
-	default "us-ascii"
-	depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
-	help
-	Default charset of the message.
-
 endmenu
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index c322e8393..a236373ae 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -9,10 +9,15 @@ menu "Miscellaneous Utilities"
 config BUSYBOX_ADJTIMEX
 	bool "adjtimex (4.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Adjtimex reads and optionally sets adjustment parameters for
 	the Linux clock adjustment algorithm.
+config BUSYBOX_ASCII
+	bool "ascii"
+	default y
+	help
+	Print ascii table.
+
 config BUSYBOX_BBCONFIG
 	bool "bbconfig (9.7 kb)"
 	default n
@@ -122,7 +127,6 @@ endif
 config BUSYBOX_BEEP
 	bool "beep (2.4 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The beep applets beeps in a given freq/Hz.
 
@@ -210,7 +214,6 @@ config BUSYBOX_FEATURE_CHAT_CLR_ABORT
 config BUSYBOX_CONSPY
 	bool "conspy (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	A text-mode VNC like program for Linux virtual terminals.
 	example:  conspy NUM      shared access to console num
@@ -276,7 +279,6 @@ config BUSYBOX_CRONTAB
 config BUSYBOX_DEVFSD
 	bool "devfsd (obsolete)"
 	default n
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
 	This is deprecated and should NOT be used anymore.
@@ -319,7 +321,6 @@ config BUSYBOX_DEVFSD_VERBOSE
 config BUSYBOX_FEATURE_DEVFS
 	bool "Use devfs names for all devices (obsolete)"
 	default n
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	This is obsolete and should NOT be used anymore.
 	Use linux >= 2.6 (optionally with hotplug) and mdev instead!
@@ -337,7 +338,6 @@ config BUSYBOX_DEVMEM
 config BUSYBOX_FBSPLASH
 	bool "fbsplash (26 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Shows splash image and progress bar on framebuffer device.
 	Can be used during boot phase of an embedded device.
@@ -383,7 +383,6 @@ config BUSYBOX_FLASHCP
 config BUSYBOX_HDPARM
 	bool "hdparm (25 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Get/Set hard drive parameters. Primarily intended for ATA
 	drives.
@@ -445,35 +444,30 @@ config BUSYBOX_HEXEDIT
 config BUSYBOX_I2CGET
 	bool "i2cget (5.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Read from I2C/SMBus chip registers.
 
 config BUSYBOX_I2CSET
 	bool "i2cset (6.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Set I2C registers.
 
 config BUSYBOX_I2CDUMP
 	bool "i2cdump (7.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Examine I2C registers.
 
 config BUSYBOX_I2CDETECT
 	bool "i2cdetect (7.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Detect I2C chips.
 
 config BUSYBOX_I2CTRANSFER
 	bool "i2ctransfer (4.0 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Send user-defined I2C messages in one transfer.
 
@@ -582,7 +576,6 @@ config BUSYBOX_FEATURE_LESS_ENV
 config BUSYBOX_LSSCSI
 	bool "lsscsi (2.5 kb)"
 	default y
-	#select PLATFORM_LINUX
 	help
 	lsscsi is a utility for displaying information about SCSI buses in the
 	system and devices connected to them.
@@ -629,6 +622,13 @@ config BUSYBOX_MICROCOM
 	default y
 	help
 	The poor man's minicom utility for chatting with serial port devices.
+config BUSYBOX_MIM
+	bool "mim (0.5 kb)"
+	default y
+	depends on BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
+	help
+	Run a script from a Makefile-like specification file.
+	Unlike 'make' dependencies aren't supported.
 config BUSYBOX_MT
 	bool "mt (2.5 kb)"
 	default y
@@ -639,26 +639,22 @@ config BUSYBOX_MT
 config BUSYBOX_NANDWRITE
 	bool "nandwrite (4.8 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Write to the specified MTD device, with bad blocks awareness
 
 config BUSYBOX_NANDDUMP
 	bool "nanddump (5.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Dump the content of raw NAND chip
 config BUSYBOX_PARTPROBE
 	bool "partprobe (3.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Ask kernel to rescan partition table.
 config BUSYBOX_RAIDAUTORUN
 	bool "raidautorun (1.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	raidautorun tells the kernel md driver to
 	search and start RAID arrays.
@@ -666,7 +662,6 @@ config BUSYBOX_READAHEAD
 	bool "readahead (1.5 kb)"
 	default y
 	depends on BUSYBOX_LFS
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Preload the files listed on the command line into RAM cache so that
 	subsequent reads on these files will not block on disk I/O.
@@ -682,7 +677,6 @@ config BUSYBOX_READAHEAD
 config BUSYBOX_RFKILL
 	bool "rfkill (4.4 kb)"
 	default n # doesn't build on Ubuntu 9.04
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Enable/disable wireless devices.
 
@@ -703,7 +697,6 @@ config BUSYBOX_RUNLEVEL
 config BUSYBOX_RX
 	bool "rx (2.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Receive files using the Xmodem protocol.
 config BUSYBOX_SETFATTR
@@ -714,7 +707,6 @@ config BUSYBOX_SETFATTR
 config BUSYBOX_SETSERIAL
 	bool "setserial (6.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Retrieve or set Linux serial port.
 config BUSYBOX_STRINGS
@@ -744,48 +736,41 @@ config BUSYBOX_TTYSIZE
 config BUSYBOX_UBIATTACH
 	bool "ubiattach (4.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Attach MTD device to an UBI device.
 
 config BUSYBOX_UBIDETACH
 	bool "ubidetach (4.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Detach MTD device from an UBI device.
 
 config BUSYBOX_UBIMKVOL
 	bool "ubimkvol (5.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Create a UBI volume.
 
 config BUSYBOX_UBIRMVOL
 	bool "ubirmvol (4.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Delete a UBI volume.
 
 config BUSYBOX_UBIRSVOL
 	bool "ubirsvol (4.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Resize a UBI volume.
 
 config BUSYBOX_UBIUPDATEVOL
 	bool "ubiupdatevol (5.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Update a UBI volume.
 config BUSYBOX_UBIRENAME
 	bool "ubirename (2.4 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Utility to rename UBI volumes
 config BUSYBOX_VOLNAME
@@ -796,7 +781,6 @@ config BUSYBOX_VOLNAME
 config BUSYBOX_WATCHDOG
 	bool "watchdog (5.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The watchdog utility is used with hardware or software watchdog
 	device drivers. It opens the specified watchdog device special file
@@ -805,4 +789,19 @@ config BUSYBOX_WATCHDOG
 	certain amount of time, the watchdog device assumes the system has
 	hung, and will cause the hardware to reboot.
 
+config BUSYBOX_FEATURE_WATCHDOG_OPEN_TWICE
+	bool "Open watchdog device twice, closing it gracefully in between"
+	depends on BUSYBOX_WATCHDOG
+	default n   # this behavior was essentially a hack for a broken driver
+	help
+	When enabled, the watchdog device is opened and then immediately
+	magic-closed, before being opened a second time. This may be necessary
+	for some watchdog devices, but can cause spurious warnings in the
+	kernel log if the nowayout feature is enabled. If this workaround
+	is really needed for you machine to work properly, consider whether
+	it should be fixed in the kernel driver instead. Even when disabled,
+	the behaviour is easily emulated with a "printf 'V' > /dev/watchdog"
+	immediately before starting the busybox watchdog daemon. Say n unless
+	you know that you absolutely need this.
+
 endmenu
diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in
index 40d224bc3..609d76a09 100644
--- a/config/busybox/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -37,7 +37,6 @@ config BUSYBOX_MODPROBE_SMALL
 config BUSYBOX_DEPMOD
 	bool "depmod (27 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	depmod generates modules.dep (and potentially modules.alias
 	and modules.symbols) that contain dependency information
@@ -45,13 +44,11 @@ config BUSYBOX_DEPMOD
 config BUSYBOX_INSMOD
 	bool "insmod (22 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	insmod is used to load specified modules in the running kernel.
 config BUSYBOX_LSMOD
 	bool "lsmod (1.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	lsmod is used to display a list of loaded modules.
 
@@ -66,13 +63,11 @@ config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 config BUSYBOX_MODINFO
 	bool "modinfo (24 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Show information about a Linux Kernel module
 config BUSYBOX_MODPROBE
 	bool "modprobe (28 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Handle the loading of modules, and their dependencies on a high
 	level.
@@ -90,7 +85,6 @@ config BUSYBOX_FEATURE_MODPROBE_BLACKLIST
 config BUSYBOX_RMMOD
 	bool "rmmod (3.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	rmmod is used to unload specified modules from the kernel.
 
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index 188f25051..3a3ad56d9 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -47,6 +47,32 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS
 	"can't resolve 'hostname.com'" and want to know more.
 	This may increase size of your executable a bit.
 
+config BUSYBOX_FEATURE_ETC_NETWORKS
+	bool "Support /etc/networks"
+	default n
+	help
+	Enable support for network names in /etc/networks. This is
+	a rarely used feature which allows you to use names
+	instead of IP/mask pairs in route command.
+
+config BUSYBOX_FEATURE_ETC_SERVICES
+	bool "Consult /etc/services even for well-known ports"
+	default n
+	help
+	Look up e.g. "telnet" and "http" in /etc/services file
+	instead of assuming ports 23 and 80.
+	This is almost never necessary (everybody uses standard ports),
+	and it makes sense to avoid reading this file.
+	If you disable this option, in the cases where port is explicitly
+	specified as a service name (e.g. "telnet HOST PORTNAME"),
+	it will still be looked up in /etc/services.
+
+config BUSYBOX_FEATURE_HWIB
+	bool "Support infiniband HW"
+	default y
+	help
+	Support for printing infiniband addresses in network applets.
+
 config BUSYBOX_FEATURE_TLS_SHA1
 	bool "In TLS code, support ciphers which use deprecated SHA1"
 	depends on BUSYBOX_TLS
@@ -61,19 +87,16 @@ config BUSYBOX_FEATURE_TLS_SHA1
 config BUSYBOX_ARP
 	bool "arp (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Manipulate the system ARP cache.
 config BUSYBOX_ARPING
 	bool "arping (9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Ping hosts by ARP packets.
 config BUSYBOX_BRCTL
 	bool "brctl (4.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Manage ethernet bridges.
 	Supports addbr/delbr and addif/delif.
@@ -104,7 +127,6 @@ config BUSYBOX_DNSD
 config BUSYBOX_ETHER_WAKE
 	bool "ether-wake (4.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Send a magic packet to wake up sleeping machines.
 config BUSYBOX_FTPD
@@ -177,6 +199,12 @@ config BUSYBOX_HTTPD
 	help
 	HTTP server.
 
+config BUSYBOX_FEATURE_HTTPD_PORT_DEFAULT
+	int "Default port"
+	default 80
+	range 1 65535
+	depends on BUSYBOX_HTTPD
+
 config BUSYBOX_FEATURE_HTTPD_RANGES
 	bool "Support 'Ranges:' header"
 	default y
@@ -289,10 +317,47 @@ config BUSYBOX_FEATURE_HTTPD_GZIP
 	help
 	Makes httpd send files using GZIP content encoding if the
 	client supports it and a pre-compressed <file>.gz exists.
+
+config BUSYBOX_FEATURE_HTTPD_ETAG
+	bool "Support caching via ETag header"
+	default y
+	depends on BUSYBOX_HTTPD
+	help
+	If server responds with ETag then next time client (browser)
+	resend it via If-None-Match header.
+	Then httpd will check if file wasn't modified and if not,
+	return 304 Not Modified status code.
+	The ETag value is constructed from last modification date
+	in unix epoch, and size: "hex(last_mod)-hex(file_size)".
+	It's not completely reliable as hash functions but fair enough.
+
+config BUSYBOX_FEATURE_HTTPD_LAST_MODIFIED
+	bool "Add Last-Modified header to response"
+	default y
+	depends on BUSYBOX_HTTPD
+	help
+	The Last-Modified header is used for cache validation.
+	The client sends last seen mtime to server in If-Modified-Since.
+	Both headers MUST be an RFC 1123 formatted, which is hard to parse.
+	Use ETag header instead.
+
+config BUSYBOX_FEATURE_HTTPD_DATE
+	bool "Add Date header to response"
+	default y
+	depends on BUSYBOX_HTTPD
+	help
+	RFC2616 says that server MUST add Date header to response.
+	But it is almost useless and can be omitted.
+
+config BUSYBOX_FEATURE_HTTPD_ACL_IP
+	bool "ACL IP"
+	default y
+	depends on BUSYBOX_HTTPD
+	help
+	Support IP deny/allow rules
 config BUSYBOX_IFCONFIG
 	bool "ifconfig (12 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Ifconfig is used to configure the kernel-resident network interfaces.
 
@@ -339,14 +404,12 @@ config BUSYBOX_FEATURE_IFCONFIG_BROADCAST_PLUS
 config BUSYBOX_IFENSLAVE
 	bool "ifenslave (13 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Userspace application to bind several interfaces
 	to a logical interface (use with kernel bonding driver).
 config BUSYBOX_IFPLUGD
 	bool "ifplugd (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Network interface plug detection daemon.
 config BUSYBOX_IFUP
@@ -498,7 +561,6 @@ config BUSYBOX_FEATURE_INETD_RPC
 config BUSYBOX_IP
 	bool "ip (35 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The "ip" applet is a TCP/IP interface configuration and routing
 	utility.
@@ -510,7 +572,6 @@ config BUSYBOX_IPADDR
 	bool "ipaddr (14 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_ADDRESS
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Short form of "ip addr"
 
@@ -518,7 +579,6 @@ config BUSYBOX_IPLINK
 	bool "iplink (17 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_LINK
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Short form of "ip link"
 
@@ -526,7 +586,6 @@ config BUSYBOX_IPROUTE
 	bool "iproute (15 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_ROUTE
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Short form of "ip route"
 
@@ -534,7 +593,6 @@ config BUSYBOX_IPTUNNEL
 	bool "iptunnel (9.6 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_TUNNEL
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Short form of "ip tunnel"
 
@@ -542,7 +600,6 @@ config BUSYBOX_IPRULE
 	bool "iprule (10 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_RULE
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Short form of "ip rule"
 
@@ -550,7 +607,6 @@ config BUSYBOX_IPNEIGH
 	bool "ipneigh (8.3 kb)"
 	default y
 	select BUSYBOX_FEATURE_IP_NEIGH
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Short form of "ip neigh"
 
@@ -641,7 +697,6 @@ config BUSYBOX_FAKEIDENTD
 config BUSYBOX_NAMEIF
 	bool "nameif (6.6 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
 	nameif is used to rename network interface by its MAC address.
@@ -713,7 +768,6 @@ config BUSYBOX_NC_110_COMPAT
 config BUSYBOX_NETSTAT
 	bool "netstat (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	netstat prints information about the Linux networking subsystem.
 
@@ -750,7 +804,6 @@ config BUSYBOX_FEATURE_NSLOOKUP_LONG_OPTIONS
 config BUSYBOX_NTPD
 	bool "ntpd (22 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The NTP client/server daemon.
 
@@ -777,7 +830,6 @@ config BUSYBOX_FEATURE_NTP_AUTH
 config BUSYBOX_PING
 	bool "ping (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to
 	elicit an ICMP ECHO_RESPONSE from a host or gateway.
@@ -805,13 +857,11 @@ config BUSYBOX_PSCAN
 config BUSYBOX_ROUTE
 	bool "route (8.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Route displays or manipulates the kernel's IP routing tables.
 config BUSYBOX_SLATTACH
 	bool "slattach (6.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	slattach configures serial line as SLIP network interface.
 config BUSYBOX_SSL_CLIENT
@@ -921,6 +971,12 @@ config BUSYBOX_FEATURE_TELNETD_STANDALONE
 	help
 	Selecting this will make telnetd able to run standalone.
 
+config BUSYBOX_FEATURE_TELNETD_PORT_DEFAULT
+	int "Default port"
+	default 23
+	range 1 65535
+	depends on BUSYBOX_FEATURE_TELNETD_STANDALONE
+
 config BUSYBOX_FEATURE_TELNETD_INETD_WAIT
 	bool "Support -w SEC option (inetd wait mode)"
 	default y
@@ -1011,7 +1067,6 @@ config BUSYBOX_TLS
 config BUSYBOX_TRACEROUTE
 	bool "traceroute (11 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Utility to trace the route of IP packets.
 
@@ -1037,7 +1092,6 @@ config BUSYBOX_FEATURE_TRACEROUTE_USE_ICMP
 config BUSYBOX_TUNCTL
 	bool "tunctl (6.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	tunctl creates or deletes tun devices.
 
@@ -1051,7 +1105,6 @@ config BUSYBOX_FEATURE_TUNCTL_UG
 config BUSYBOX_VCONFIG
 	bool "vconfig (2.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Creates, removes, and configures VLAN interfaces
 config BUSYBOX_WGET
@@ -1071,6 +1124,13 @@ config BUSYBOX_FEATURE_WGET_STATUSBAR
 	default y
 	depends on BUSYBOX_WGET
 
+config BUSYBOX_FEATURE_WGET_FTP
+	bool "Enable FTP protocol (+1k)"
+	default y
+	depends on BUSYBOX_WGET
+	help
+	To support FTPS, enable FEATURE_WGET_HTTPS as well.
+
 config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	bool "Enable HTTP authentication"
 	default y
@@ -1099,6 +1159,7 @@ config BUSYBOX_FEATURE_WGET_HTTPS
 	select BUSYBOX_TLS
 	help
 	wget will use internal TLS code to connect to https:// URLs.
+	It also enables FTPS support, but it's not well tested yet.
 	Note:
 	On NOMMU machines, ssl_helper applet should be available
 	in the $PATH for this to work. Make sure to select that applet.
@@ -1136,6 +1197,9 @@ config BUSYBOX_FEATURE_WGET_HTTPS
 	patches, but do want to waste bandwidth expaining how wrong
 	it is, you will be ignored.
 
+	FEATURE_WGET_OPENSSL does implement TLS verification
+	using the certificates available to OpenSSL.
+
 config BUSYBOX_FEATURE_WGET_OPENSSL
 	bool "Try to connect to HTTPS using openssl"
 	default y
@@ -1160,6 +1224,9 @@ config BUSYBOX_FEATURE_WGET_OPENSSL
 	If openssl can't be executed, internal TLS code will be used
 	(if you enabled it); if openssl can be executed but fails later,
 	wget can't detect this, and download will fail.
+
+	By default TLS verification is performed, unless
+	--no-check-certificate option is passed.
 config BUSYBOX_WHOIS
 	bool "whois (6.3 kb)"
 	default y
@@ -1168,7 +1235,6 @@ config BUSYBOX_WHOIS
 config BUSYBOX_ZCIP
 	bool "zcip (8.4 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_FEATURE_SYSLOG
 	help
 	ZCIP provides ZeroConf IPv4 address selection, according to RFC 3927.
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 683a1c8d5..4b1255c52 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -7,7 +7,6 @@
 config BUSYBOX_UDHCPD
 	bool "udhcpd (21 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	udhcpd is a DHCP server geared primarily toward embedded systems,
 	while striving to be fully functional and RFC compliant.
@@ -63,7 +62,6 @@ config BUSYBOX_DHCPRELAY
 config BUSYBOX_UDHCPC
 	bool "udhcpc (24 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	udhcpc is a DHCP client geared primarily toward embedded systems,
 	while striving to be fully functional and RFC compliant.
@@ -144,6 +142,14 @@ config BUSYBOX_FEATURE_UDHCPC6_RFC5970
 comment "Common options for DHCP applets"
         depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
 
+config BUSYBOX_UDHCPC_DEFAULT_INTERFACE
+	string "Default interface name"
+	default "eth0"
+	depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6
+	help
+	The interface that will be used if no other interface is
+	specified on the commandline.
+
 config BUSYBOX_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
 	default n
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index dfd4e2c14..0c1733b9f 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -6,10 +6,24 @@
 
 menu "Process Utilities"
 
+config BUSYBOX_FEATURE_FAST_TOP
+	bool "Faster /proc scanning code (+100 bytes)"
+	default n  # all "fast or small" options default to small
+	help
+	This option makes top and ps ~20% faster (or 20% less CPU hungry),
+	but code size is slightly bigger.
+
+config BUSYBOX_FEATURE_SHOW_THREADS
+	bool "Support thread display in ps/pstree/top"
+	default y
+	depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
+	help
+	Enables the ps -T option, showing of threads in pstree,
+	and 'h' command in top.
+
 config BUSYBOX_FREE
 	bool "free (3.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX #sysinfo()
 	help
 	free displays the total amount of free and used physical and swap
 	memory in the system, as well as the buffers used by the kernel.
@@ -144,7 +158,6 @@ config BUSYBOX_FEATURE_PS_TIME
 	bool "Enable -o time and -o etime specifiers"
 	default y
 	depends on (BUSYBOX_PS || BUSYBOX_MINIPS) && BUSYBOX_DESKTOP
-	select BUSYBOX_PLATFORM_LINUX
 
 config BUSYBOX_FEATURE_PS_UNUSUAL_SYSTEMS
 	bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -243,7 +256,6 @@ config BUSYBOX_FEATURE_TOPMEM
 config BUSYBOX_UPTIME
 	bool "uptime (3.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX #sysinfo()
 	help
 	uptime gives a one line display of the current time, how long
 	the system has been running, how many users are currently logged
@@ -262,12 +274,4 @@ config BUSYBOX_WATCH
 	watch is used to execute a program periodically, showing
 	output to the screen.
 
-config BUSYBOX_FEATURE_SHOW_THREADS
-	bool "Support thread display in ps/pstree/top"
-	default y
-	depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
-	help
-	Enables the ps -T option, showing of threads in pstree,
-	and 'h' command in top.
-
 endmenu
diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
index a1656b3cb..61275cdc5 100644
--- a/config/busybox/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -18,6 +18,7 @@ choice
 config BUSYBOX_SH_IS_ASH
 	depends on !BUSYBOX_NOMMU
 	bool "ash"
+	select BUSYBOX_SHELL_ASH
 	help
 	Choose ash to be the shell executed by 'sh' name.
 	The ash code will be built into busybox. If you don't select
@@ -26,6 +27,7 @@ config BUSYBOX_SH_IS_ASH
 
 config BUSYBOX_SH_IS_HUSH
 	bool "hush"
+	select BUSYBOX_SHELL_HUSH
 	help
 	Choose hush to be the shell executed by 'sh' name.
 	The hush code will be built into busybox. If you don't select
@@ -58,6 +60,7 @@ choice
 config BUSYBOX_BASH_IS_ASH
 	depends on !BUSYBOX_NOMMU
 	bool "ash"
+	select BUSYBOX_SHELL_ASH
 	help
 	Choose ash to be the shell executed by 'bash' name.
 	The ash code will be built into busybox. If you don't select
@@ -66,6 +69,7 @@ config BUSYBOX_BASH_IS_ASH
 
 config BUSYBOX_BASH_IS_HUSH
 	bool "hush"
+	select BUSYBOX_SHELL_HUSH
 	help
 	Choose hush to be the shell executed by 'bash' name.
 	The hush code will be built into busybox. If you don't select
@@ -78,10 +82,15 @@ config BUSYBOX_BASH_IS_NONE
 endchoice
 
 
+config BUSYBOX_SHELL_ASH
+	bool #hidden option
+	depends on !BUSYBOX_NOMMU
+
 config BUSYBOX_ASH
 	bool "ash (78 kb)"
 	default y
 	depends on !BUSYBOX_NOMMU
+	select BUSYBOX_SHELL_ASH
 	help
 	The most complete and most pedantically correct shell included with
 	busybox. This shell is actually a derivative of the Debian 'dash'
@@ -91,17 +100,17 @@ config BUSYBOX_ASH
 # ash options
 # note: Don't remove !NOMMU part in the next line; it would break
 # menuconfig's indenting.
-if !BUSYBOX_NOMMU && (BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH)
+if !BUSYBOX_NOMMU && (BUSYBOX_SHELL_ASH || BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH)
 
 config BUSYBOX_ASH_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size instead of speed"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_INTERNAL_GLOB
 	bool "Use internal glob() implementation"
 	default y	# Y is bigger, but because of uclibc glob() bug, let Y be default for now
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 	help
 	Do not use glob() function from libc, use internal implementation.
 	Use this if you are getting "glob.h: No such file or directory"
@@ -112,7 +121,7 @@ config BUSYBOX_ASH_INTERNAL_GLOB
 config BUSYBOX_ASH_BASH_COMPAT
 	bool "bash-compatible extensions"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_BASH_SOURCE_CURDIR
 	bool "'source' and '.' builtins search current directory after $PATH"
@@ -133,17 +142,17 @@ config BUSYBOX_ASH_BASH_NOT_FOUND_HOOK
 config BUSYBOX_ASH_JOB_CONTROL
 	bool "Job control"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_ALIAS
 	bool "Alias support"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_RANDOM_SUPPORT
 	bool "Pseudorandom generator and $RANDOM variable"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 	help
 	Enable pseudorandom generator and dynamic variable "$RANDOM".
 	Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -154,7 +163,7 @@ config BUSYBOX_ASH_RANDOM_SUPPORT
 config BUSYBOX_ASH_EXPAND_PRMT
 	bool "Expand prompt string"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 	help
 	$PS# may contain volatile content, such as backquote commands.
 	This option recreates the prompt string from the environment
@@ -163,14 +172,14 @@ config BUSYBOX_ASH_EXPAND_PRMT
 config BUSYBOX_ASH_IDLE_TIMEOUT
 	bool "Idle timeout variable $TMOUT"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 	help
 	Enable bash-like auto-logout after $TMOUT seconds of idle time.
 
 config BUSYBOX_ASH_MAIL
 	bool "Check for new mail in interactive shell"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 	help
 	Enable "check for new mail" function:
 	if set, $BUSYBOX_MAIL file and $BUSYBOX_MAILPATH list of files
@@ -180,32 +189,32 @@ config BUSYBOX_ASH_MAIL
 config BUSYBOX_ASH_ECHO
 	bool "echo builtin"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_PRINTF
 	bool "printf builtin"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_TEST
 	bool "test builtin"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_HELP
 	bool "help builtin"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_GETOPTS
 	bool "getopts builtin"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH_CMDCMD
 	bool "command builtin"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH
+	depends on BUSYBOX_SHELL_ASH
 	help
 	Enable support for the 'command' builtin, which allows
 	you to run the specified command or builtin,
@@ -258,6 +267,7 @@ config BUSYBOX_CTTYHACK
 config BUSYBOX_HUSH
 	bool "hush (68 kb)"
 	default y
+	select BUSYBOX_SHELL_HUSH
 	help
 	hush is a small shell. It handles the normal flow control
 	constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
@@ -269,10 +279,18 @@ config BUSYBOX_HUSH
 	It does not handle select, aliases, tilde expansion,
 	&>file and >&file redirection of stdout+stderr.
 
+config BUSYBOX_SHELL_HUSH
+	bool "Internal shell for embedded script support"
+	default n
+
+# hush options
+# It's only needed to get "nice" menuconfig indenting.
+if BUSYBOX_SHELL_HUSH || BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+
 config BUSYBOX_HUSH_BASH_COMPAT
 	bool "bash-compatible extensions"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_BRACE_EXPANSION
 	bool "Brace expansion"
@@ -281,11 +299,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION
 	help
 	Enable {abc,def} extension.
 
-config BUSYBOX_HUSH_LINENO_VAR
-	bool "$LINENO variable"
-	default y
-	depends on BUSYBOX_HUSH_BASH_COMPAT
-
 config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
 	bool "'source' and '.' builtins search current directory after $PATH"
 	default n   # do not encourage non-standard behavior
@@ -293,10 +306,15 @@ config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
 	help
 	This is not compliant with standards. Avoid if possible.
 
+config BUSYBOX_HUSH_LINENO_VAR
+	bool "$LINENO variable (bashism)"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
 config BUSYBOX_HUSH_INTERACTIVE
 	bool "Interactive mode"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	Enable interactive mode (prompt and command editing).
 	Without this, hush simply reads and executes commands
@@ -322,31 +340,31 @@ config BUSYBOX_HUSH_JOB
 config BUSYBOX_HUSH_TICK
 	bool "Support command substitution"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	Enable `command` and $(command).
 
 config BUSYBOX_HUSH_IF
 	bool "Support if/then/elif/else/fi"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_LOOPS
 	bool "Support for, while and until loops"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_CASE
 	bool "Support case ... esac statement"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	Enable case ... esac statement. +400 bytes.
 
 config BUSYBOX_HUSH_FUNCTIONS
 	bool "Support funcname() { commands; } syntax"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	Enable support for shell functions. +800 bytes.
 
@@ -360,7 +378,7 @@ config BUSYBOX_HUSH_LOCAL
 config BUSYBOX_HUSH_RANDOM_SUPPORT
 	bool "Pseudorandom generator and $RANDOM variable"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	Enable pseudorandom generator and dynamic variable "$RANDOM".
 	Each read of "$RANDOM" will generate a new pseudorandom value.
@@ -368,7 +386,7 @@ config BUSYBOX_HUSH_RANDOM_SUPPORT
 config BUSYBOX_HUSH_MODE_X
 	bool "Support 'hush -x' option and 'set -x' command"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	This instructs hush to print commands before execution.
 	Adds ~300 bytes.
@@ -376,27 +394,27 @@ config BUSYBOX_HUSH_MODE_X
 config BUSYBOX_HUSH_ECHO
 	bool "echo builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_PRINTF
 	bool "printf builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_TEST
 	bool "test builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_HELP
 	bool "help builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_EXPORT
 	bool "export builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_EXPORT_N
 	bool "Support 'export -n' option"
@@ -408,83 +426,85 @@ config BUSYBOX_HUSH_EXPORT_N
 config BUSYBOX_HUSH_READONLY
 	bool "readonly builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 	help
 	Enable support for read-only variables.
 
 config BUSYBOX_HUSH_KILL
 	bool "kill builtin (supports kill %jobspec)"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_WAIT
 	bool "wait builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_COMMAND
 	bool "command builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_TRAP
 	bool "trap builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_TYPE
 	bool "type builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_TIMES
 	bool "times builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_READ
 	bool "read builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_SET
 	bool "set builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_UNSET
 	bool "unset builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_ULIMIT
 	bool "ulimit builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_UMASK
 	bool "umask builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_GETOPTS
 	bool "getopts builtin"
 	default y
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_HUSH_MEMLEAK
 	bool "memleak builtin (debugging)"
 	default n
-	depends on BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_HUSH
+
+endif # hush options
 
 
 comment "Options common to all shells"
-if BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+if BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 
 config BUSYBOX_FEATURE_SH_MATH
 	bool "POSIX math support"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	Enable math support in the shell via $((...)) syntax.
 
@@ -505,14 +525,14 @@ config BUSYBOX_FEATURE_SH_MATH_BASE
 config BUSYBOX_FEATURE_SH_EXTRA_QUIET
 	bool "Hide message on interactive shell startup"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	Remove the busybox introduction when starting a shell.
 
 config BUSYBOX_FEATURE_SH_STANDALONE
 	bool "Standalone shell"
 	default n
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	This option causes busybox shells to use busybox applets
 	in preference to executables in the PATH whenever possible. For
@@ -533,7 +553,7 @@ config BUSYBOX_FEATURE_SH_STANDALONE
 config BUSYBOX_FEATURE_SH_NOFORK
 	bool "Run 'nofork' applets directly"
 	default n
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	This option causes busybox shells to not execute typical
 	fork/exec/wait sequence, but call <applet>_main directly,
@@ -551,14 +571,14 @@ config BUSYBOX_FEATURE_SH_NOFORK
 config BUSYBOX_FEATURE_SH_READ_FRAC
 	bool "read -t N.NNN support (+110 bytes)"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	Enable support for fractional second timeout in read builtin.
 
 config BUSYBOX_FEATURE_SH_HISTFILESIZE
 	bool "Use $HISTFILESIZE"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	This option makes busybox shells to use $HISTFILESIZE variable
 	to set shell history size. Note that its max value is capped
@@ -567,7 +587,7 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE
 config BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
 	bool "Embed scripts in the binary"
 	default y
-	depends on BUSYBOX_ASH || BUSYBOX_HUSH || BUSYBOX_SH_IS_ASH || BUSYBOX_BASH_IS_ASH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+	depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
 	help
 	Allow scripts to be compressed and embedded in the busybox
 	binary. The scripts should be placed in the 'embed' directory
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 20275755c..0d8b63557 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -23,7 +23,6 @@ config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	bool "Use the klogctl() interface"
 	default y
 	depends on BUSYBOX_KLOGD
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The klogd applet supports two interfaces for reading
 	kernel messages. Linux provides the klogctl() interface
@@ -116,6 +115,14 @@ config BUSYBOX_FEATURE_SYSLOGD_CFG
 	help
 	Supports restricted syslogd config. See docs/syslog.conf.txt
 
+config BUSYBOX_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS
+	bool "Include milliseconds in timestamps"
+	default n
+	depends on BUSYBOX_SYSLOGD
+	help
+	Includes milliseconds (HH:MM:SS.mmm) in timestamp when
+	timestamps are added.
+
 config BUSYBOX_FEATURE_SYSLOGD_READ_BUFFER_SIZE
 	int "Read buffer size in bytes"
 	default 256
@@ -153,7 +160,6 @@ config BUSYBOX_FEATURE_KMSG_SYSLOG
 	bool "Linux kernel printk buffer support"
 	default y
 	depends on BUSYBOX_SYSLOGD
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	When you enable this feature, the syslogd utility will
 	write system log message to the Linux kernel's printk buffer.
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index ec053a39c..e0adb9ea0 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -9,7 +9,6 @@ menu "Linux System Utilities"
 config BUSYBOX_ACPID
 	bool "acpid (9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	acpid listens to ACPI events coming either in textual form from
 	/proc/acpi/event (though it is marked deprecated it is still widely
@@ -31,13 +30,11 @@ config BUSYBOX_FEATURE_ACPID_COMPAT
 config BUSYBOX_BLKDISCARD
 	bool "blkdiscard (4.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	blkdiscard discards sectors on a given device.
 config BUSYBOX_BLKID
 	bool "blkid (12 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_VOLUMEID
 	help
 	Lists labels and UUIDs of all filesystems.
@@ -67,7 +64,6 @@ config BUSYBOX_CHRT
 config BUSYBOX_DMESG
 	bool "dmesg (3.7 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	dmesg is used to examine or control the kernel ring buffer. When the
 	Linux kernel prints messages to the system log, they are stored in
@@ -100,7 +96,6 @@ config BUSYBOX_FEATURE_DMESG_PRETTY
 config BUSYBOX_EJECT
 	bool "eject (4 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Used to eject cdroms. (defaults to /dev/cdrom)
 
@@ -119,13 +114,11 @@ config BUSYBOX_FALLOCATE
 config BUSYBOX_FATATTR
 	bool "fatattr (1.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	fatattr lists or changes the file attributes on a fat file system.
 config BUSYBOX_FBSET
 	bool "fbset (5.9 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	fbset is used to show or change the settings of a Linux frame buffer
 	device. The frame buffer device provides a simple and unique
@@ -153,13 +146,11 @@ config BUSYBOX_FEATURE_FBSET_READMODE
 config BUSYBOX_FDFORMAT
 	bool "fdformat (4.4 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	fdformat is used to low-level format a floppy disk.
 config BUSYBOX_FDISK
 	bool "fdisk (37 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The fdisk utility is used to divide hard disks into one or more
 	logical disks, which are generally called partitions. This utility
@@ -233,7 +224,6 @@ config BUSYBOX_FEATURE_FDISK_ADVANCED
 config BUSYBOX_FINDFS
 	bool "findfs (12 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_VOLUMEID
 	help
 	Prints the name of a filesystem with given label or UUID.
@@ -245,7 +235,6 @@ config BUSYBOX_FLOCK
 config BUSYBOX_FDFLUSH
 	bool "fdflush (1.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	fdflush is only needed when changing media on slightly-broken
 	removable media drives. It is used to make Linux believe that a
@@ -258,7 +247,6 @@ config BUSYBOX_FDFLUSH
 config BUSYBOX_FREERAMDISK
 	bool "freeramdisk (1.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Linux allows you to create ramdisks. This utility allows you to
 	delete them and completely free all memory that was used for the
@@ -279,14 +267,12 @@ config BUSYBOX_FSCK_MINIX
 config BUSYBOX_FSFREEZE
 	bool "fsfreeze (3.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_LONG_OPTS
 	help
 	Halt new accesses and flush writes on a mounted filesystem.
 config BUSYBOX_FSTRIM
 	bool "fstrim (4.4 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Discard unused blocks on a mounted filesystem.
 config BUSYBOX_GETOPT
@@ -313,16 +299,6 @@ config BUSYBOX_HEXDUMP
 	The hexdump utility is used to display binary data in a readable
 	way that is comparable to the output from most hex editors.
 
-config BUSYBOX_FEATURE_HEXDUMP_REVERSE
-	bool "Support -R, reverse of 'hexdump -Cv'"
-	default y
-	depends on BUSYBOX_HEXDUMP
-	help
-	The hexdump utility is used to display binary data in an ascii
-	readable way. This option creates binary data from an ascii input.
-	NB: this option is non-standard. It's unwise to use it in scripts
-	aimed to be portable.
-
 config BUSYBOX_HD
 	bool "hd (7.8 kb)"
 	default y
@@ -337,7 +313,6 @@ config BUSYBOX_XXD
 config BUSYBOX_HWCLOCK
 	bool "hwclock (5.8 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The hwclock utility is used to read and set the hardware clock
 	on a system. This is primarily used to set the current time on
@@ -358,7 +333,6 @@ config BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS
 config BUSYBOX_IONICE
 	bool "ionice (3.8 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Set/set program io scheduling class and priority
 	Requires kernel >= 2.6.13
@@ -372,7 +346,6 @@ config BUSYBOX_IPCRM
 config BUSYBOX_IPCS
 	bool "ipcs (11 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The ipcs utility is used to provide information on the currently
 	allocated System V interprocess (IPC) objects in the system.
@@ -393,7 +366,6 @@ config BUSYBOX_FEATURE_LAST_FANCY
 config BUSYBOX_LOSETUP
 	bool "losetup (5.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	losetup is used to associate or detach a loop device with a regular
 	file or block device, and to query the status of a loop device. This
@@ -401,7 +373,6 @@ config BUSYBOX_LOSETUP
 config BUSYBOX_LSPCI
 	bool "lspci (6.3 kb)"
 	default y
-	#select PLATFORM_LINUX
 	help
 	lspci is a utility for displaying information about PCI buses in the
 	system and devices connected to them.
@@ -410,7 +381,6 @@ config BUSYBOX_LSPCI
 config BUSYBOX_LSUSB
 	bool "lsusb (4.2 kb)"
 	default y
-	#select PLATFORM_LINUX
 	help
 	lsusb is a utility for displaying information about USB buses in the
 	system and devices connected to them.
@@ -419,7 +389,6 @@ config BUSYBOX_LSUSB
 config BUSYBOX_MDEV
 	bool "mdev (17 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	mdev is a mini-udev implementation for dynamically creating device
 	nodes in the /dev directory.
@@ -505,20 +474,17 @@ config BUSYBOX_FEATURE_MESG_ENABLE_ONLY_GROUP
 config BUSYBOX_MKE2FS
 	bool "mke2fs (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Utility to create EXT2 filesystems.
 
 config BUSYBOX_MKFS_EXT2
 	bool "mkfs.ext2 (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Alias to "mke2fs".
 config BUSYBOX_MKFS_MINIX
 	bool "mkfs.minix (10 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The minix filesystem is a nice, small, compact, read-write filesystem
 	with little overhead. If you wish to be able to create minix
@@ -535,21 +501,18 @@ config BUSYBOX_FEATURE_MINIX2
 config BUSYBOX_MKFS_REISER
 	bool "mkfs_reiser"
 	default n
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Utility to create ReiserFS filesystems.
 	Note: this applet needs a lot of testing and polishing.
 config BUSYBOX_MKDOSFS
 	bool "mkdosfs (7.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Utility to create FAT32 filesystems.
 
 config BUSYBOX_MKFS_VFAT
 	bool "mkfs.vfat (7.2 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Alias to "mkdosfs".
 config BUSYBOX_MKSWAP
@@ -583,7 +546,6 @@ config BUSYBOX_MORE
 config BUSYBOX_MOUNT
 	bool "mount (23 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	All files and filesystems in Unix are arranged into one big directory
 	tree. The 'mount' utility is used to graft a filesystem onto a
@@ -685,7 +647,7 @@ config BUSYBOX_NOLOGIN
 
 config BUSYBOX_NOLOGIN_DEPENDENCIES
 	bool "Enable dependencies for nologin"
-	default y
+	default n  # Y default makes it harder to select single-applet test
 	depends on BUSYBOX_NOLOGIN
 	select BUSYBOX_CAT
 	select BUSYBOX_ECHO
@@ -699,13 +661,11 @@ config BUSYBOX_NOLOGIN_DEPENDENCIES
 config BUSYBOX_NSENTER
 	bool "nsenter (6.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Run program with namespaces of other processes.
 config BUSYBOX_PIVOT_ROOT
 	bool "pivot_root (1.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The pivot_root utility swaps the mount points for the root filesystem
 	with some other mounted filesystem. This allows you to do all sorts
@@ -730,7 +690,6 @@ config BUSYBOX_RDEV
 config BUSYBOX_READPROFILE
 	bool "readprofile (7.1 kb)"
 	default y
-	#select PLATFORM_LINUX
 	help
 	This allows you to parse /proc/profile for basic profiling.
 config BUSYBOX_RENICE
@@ -747,7 +706,6 @@ config BUSYBOX_REV
 config BUSYBOX_RTCWAKE
 	bool "rtcwake (6.8 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Enter a system sleep state until specified wakeup time.
 config BUSYBOX_SCRIPT
@@ -764,7 +722,6 @@ config BUSYBOX_SCRIPTREPLAY
 config BUSYBOX_SETARCH
 	bool "setarch (3.6 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The linux32 utility is used to create a 32bit environment for the
 	specified program (usually a shell). It only makes sense to have
@@ -774,20 +731,17 @@ config BUSYBOX_SETARCH
 config BUSYBOX_LINUX32
 	bool "linux32 (3.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Alias to "setarch linux32".
 
 config BUSYBOX_LINUX64
 	bool "linux64 (3.3 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Alias to "setarch linux64".
 config BUSYBOX_SETPRIV
 	bool "setpriv (6.6 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_LONG_OPTS
 	help
 	Run a program with different Linux privilege settings.
@@ -828,7 +782,6 @@ config BUSYBOX_SETSID
 config BUSYBOX_SWAPON
 	bool "swapon (15 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	Once you have created some swap space using 'mkswap', you also need
 	to enable your swap space with the 'swapon' utility. The 'swapoff'
@@ -855,7 +808,6 @@ config BUSYBOX_FEATURE_SWAPON_PRI
 config BUSYBOX_SWAPOFF
 	bool "swapoff (14 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 
 config BUSYBOX_FEATURE_SWAPONOFF_LABEL
 	bool "Support specifying devices by label or UUID"
@@ -868,7 +820,6 @@ config BUSYBOX_FEATURE_SWAPONOFF_LABEL
 config BUSYBOX_SWITCH_ROOT
 	bool "switch_root (5.5 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	The switch_root utility is used from initramfs to select a new
 	root device. Under initramfs, you have to use this instead of
@@ -900,17 +851,23 @@ config BUSYBOX_FEATURE_TASKSET_FANCY
 	Needed for machines with more than 32-64 CPUs:
 	affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
 	in this case. Otherwise, it is limited to sizeof(long).
+
+config BUSYBOX_FEATURE_TASKSET_CPULIST
+	bool "CPU list support (-c option)"
+	default y
+	depends on BUSYBOX_FEATURE_TASKSET_FANCY
+	help
+	Add support for taking/printing affinity as CPU list when '-c'
+	option is used. For example, it prints '0-3,7' instead of mask '8f'.
 config BUSYBOX_UEVENT
 	bool "uevent (3.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	uevent is a netlink listener for kernel uevent notifications
 	sent via netlink. It is usually used for dynamic device creation.
 config BUSYBOX_UMOUNT
 	bool "umount (5.1 kb)"
 	default y
-	select BUSYBOX_PLATFORM_LINUX
 	help
 	When you want to remove a mounted filesystem from its current mount
 	point, for example when you are shutting down the system, the
@@ -927,7 +884,6 @@ config BUSYBOX_UNSHARE
 	bool "unshare (7.2 kb)"
 	default y
 	depends on !BUSYBOX_NOMMU
-	select BUSYBOX_PLATFORM_LINUX
 	select BUSYBOX_LONG_OPTS
 	help
 	Run program with some namespaces unshared from parent.
diff --git a/config/busybox/util-linux/volume_id/Config.in b/config/busybox/util-linux/volume_id/Config.in
index f71425874..828482d54 100644
--- a/config/busybox/util-linux/volume_id/Config.in
+++ b/config/busybox/util-linux/volume_id/Config.in
@@ -23,6 +23,12 @@ config BUSYBOX_FEATURE_VOLUMEID_CRAMFS
 	bool "cramfs filesystem"
 	default y
 	depends on BUSYBOX_VOLUMEID
+config BUSYBOX_FEATURE_VOLUMEID_EROFS
+	bool "erofs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	Erofs is a compressed readonly filesystem for Linux.
 config BUSYBOX_FEATURE_VOLUMEID_EXFAT
 	bool "exFAT filesystem"
 	default y