Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / cmd / Kconfig

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 45c83359add828a60dd8e6f69f9b4abb39a2e44d..2fa0829925c1b9f290d982fbbc1a008a7dcdc2ba 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1121,6 +1121,16 @@ config BOOTP_HOSTNAME
        help
          The name may or may not be qualified with the local domain name.
 
+config BOOTP_PREFER_SERVERIP
+       bool "serverip variable takes precedent over DHCP server IP."
+       depends on CMD_BOOTP
+       help
+         By default a BOOTP/DHCP reply will overwrite the 'serverip' variable.
+
+         With this option enabled, the 'serverip' variable in the environment
+         takes precedence over DHCP server IP and will only be set by the DHCP
+         server if not already set in the environment.
+
 config BOOTP_SUBNETMASK
        bool "Request & store 'netmask' from BOOTP/DHCP server"
        default y
@@ -1239,6 +1249,11 @@ config CMD_PXE
        help
          Boot image via network using PXE protocol
 
+config CMD_WOL
+       bool "wol"
+       help
+         Wait for wake-on-lan Magic Packet
+
 endif
 
 menu "Misc commands"
@@ -1341,6 +1356,13 @@ config CMD_MISC
        help
          Delay execution for some time
 
+config MP
+       bool "support for multiprocessor"
+       help
+         This provides an option to brinup
+         different processors in multiprocessor
+         cases.
+
 config CMD_TIMER
        bool "timer"
        help