Convert CONFIG_SYS_DEVICE_NULLDEV to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_DEVICE_NULLDEV

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig b/common/Kconfig
index 62d78c5bd739adc1cf7218ea7291a87a46549a25..5a6d0e0e79b792f0195fb65476fb8ecfcdb00fce 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -635,6 +635,22 @@ config SYS_STDIO_DEREGISTER
          removed (for example a USB keyboard) then this option can be
          enabled to ensure this is handled correctly.
 
+config SPL_SYS_STDIO_DEREGISTER
+       bool "Allow deregistering stdio devices in SPL"
+       help
+         Generally there is no need to deregister stdio devices since they
+         are never deactivated. But if a stdio device is used which can be
+         removed (for example a USB keyboard) then this option can be
+         enabled to ensure this is handled correctly. This is very rarely
+         needed in SPL.
+
+config SYS_DEVICE_NULLDEV
+       bool "Enable a null device for stdio"
+       help
+         Enable creation of a "nulldev" stdio device. This allows silent
+         operation of the console by setting stdout to "nulldev". Enable
+         this to use a serial console under board control.
+
 endmenu
 
 menu "Logging"

diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig
index d4871c60c70bb6cc633e0e7492cb8be7dcd754be..8f8a4a6bad56157645b993e61e23c49e31aa0823 100644 (file)
--- a/configs/M5249EVB_defconfig
+++ b/configs/M5249EVB_defconfig
@@ -5,6 +5,7 @@ CONFIG_ENV_SECT_SIZE=0x2000
 CONFIG_TARGET_M5249EVB=y
 CONFIG_DEFAULT_DEVICE_TREE="M5249EVB"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_SYS_DEVICE_NULLDEV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTOBOOT is not set

diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 89e05608423b414e7099c8ee599de754ac8a5897..2865730b8ff5ec16e7a19df14d8b5af27c3749ce 100644 (file)
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -10,6 +10,7 @@ CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200"
+CONFIG_SYS_DEVICE_NULLDEV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 # CONFIG_CMDLINE_EDITING is not set

diff --git a/doc/README.silent b/doc/README.silent
index 6d90a0ec40376d87f87c2ed549bd26fc6b0d07e2..00288e03b01a05f480f39ac7f279422f94e13d80 100644 (file)
--- a/doc/README.silent
+++ b/doc/README.silent
@@ -19,7 +19,7 @@ The following actions are taken if "silent" is set at boot time:
  - When the console devices have been initialized, "stdout" and
    "stderr" are set to "nulldev", so subsequent messages are
    suppressed automatically. Make sure to enable "nulldev" by
-   #defining CONFIG_SYS_DEVICE_NULLDEV in your board config file.
+   enabling CONFIG_SYS_DEVICE_NULLDEV in your board defconfig file.
 
  - When booting a linux kernel, the "bootargs" are fixed up so that
    the argument "console=" will be in the command line, no matter how

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index de7132940c197cff7df2dc8015d535b5389b93d0..1a1a11076543f5f0aaa0c97e6023166cfdeff88c 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -31,8 +31,6 @@
  */
 #undef CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_SYS_DEVICE_NULLDEV      1       /* include nulldev device       */
-
 #define CONFIG_SYS_LOAD_ADDR           0x200000        /* default load address */
 
 /*

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4686b8946e3d1dccbdf39177827f6a5db828d630..3dedcdaad28d72100156aa86e4b8935d11e20267 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -69,8 +69,6 @@
 #define        CONFIG_BOOTP_BOOTFILESIZE
 #endif
 
-#define        CONFIG_SYS_DEVICE_NULLDEV       1
-
 /*
  * Clock Configuration
  */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5c6790bd8df4aad0842ffe4f62e97890e65f1bf8..14d5e4c175787b58849e12553715484735e95183 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2117,7 +2117,6 @@ CONFIG_SYS_DEBUG_SERVER_FW_IN_NOR
 CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 CONFIG_SYS_DEFAULT_VIDEO_MODE
 CONFIG_SYS_DEF_EEPROM_ADDR
-CONFIG_SYS_DEVICE_NULLDEV
 CONFIG_SYS_DFU_DATA_BUF_SIZE
 CONFIG_SYS_DFU_MAX_FILE_SIZE
 CONFIG_SYS_DIAG_ADDR