diff options
author | Simon Glass <sjg@chromium.org> | 2017-08-04 22:34:46 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-08-11 19:41:56 (GMT) |
commit | 719d36ee36db92221e86b37edd1f7b922bde4f9d (patch) | |
tree | 579da03a00d9176fcb73b8f227383e20eef66bb9 | |
parent | efce2442d31a51322f2cab366285f91e5c9edc70 (diff) | |
download | u-boot-fsl-qoriq-719d36ee36db92221e86b37edd1f7b922bde4f9d.tar.xz |
Convert CONFIG_CMD_SF_TEST to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_SF_TEST
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
-rw-r--r-- | README | 6 | ||||
-rw-r--r-- | arch/Kconfig | 2 | ||||
-rw-r--r-- | cmd/Kconfig | 11 | ||||
-rw-r--r-- | configs/chromebit_mickey_defconfig | 1 | ||||
-rw-r--r-- | configs/chromebook_jerry_defconfig | 1 | ||||
-rw-r--r-- | configs/chromebook_minnie_defconfig | 1 | ||||
-rw-r--r-- | configs/efi-x86_defconfig | 1 | ||||
-rw-r--r-- | configs/sandbox_defconfig | 4 | ||||
-rw-r--r-- | include/configs/efi-x86.h | 2 | ||||
-rw-r--r-- | include/configs/sandbox.h | 1 | ||||
-rw-r--r-- | include/configs/veyron.h | 2 | ||||
-rw-r--r-- | include/configs/x86-common.h | 1 | ||||
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
13 files changed, 18 insertions, 16 deletions
@@ -2495,12 +2495,6 @@ The following options need to be configured: CONFIG_SF_DEFAULT_MODE (see include/spi.h) CONFIG_SF_DEFAULT_SPEED in Hz - CONFIG_CMD_SF_TEST - - Define this option to include a destructive SPI flash - test ('sf test'). - -- SystemACE Support: CONFIG_SYSTEMACE Adding this option adds support for Xilinx SystemACE diff --git a/arch/Kconfig b/arch/Kconfig index e063ee0..08f6e7f 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -78,6 +78,7 @@ config SANDBOX imply LZMA imply SCSI imply CMD_SATA + imply CMD_SF_TEST config SH bool "SuperH architecture" @@ -111,6 +112,7 @@ config X86 imply CMD_GETTIME imply CMD_IO imply CMD_IRQ + imply CMD_SF_TEST config XTENSA bool "Xtensa architecture" diff --git a/cmd/Kconfig b/cmd/Kconfig index 507e8a3..5ac8389 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -797,6 +797,17 @@ config CMD_SF help SPI Flash support +config CMD_SF_TEST + bool "sf test - Allow testing of SPI flash" + help + Provides a way to test that SPI flash is working correctly. The + test is destructive, in that an area of SPI flash must be provided + for the test to use. Performance information is also provided, + measuring the performance of reading, writing and erasing in + Mbps (Million Bits Per Second). This value should approximately + equal the SPI bus speed for a single-bit-wide SPI bus, assuming + everything is working properly. + config CMD_SPI bool "sspi" help diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index 01032e7..b4e7270 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index b9d4fc9..8e91db4 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index fb955e4..e512ce1 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y CONFIG_CMD_GPIO=y +CONFIG_CMD_SF_TEST=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index 789c5ce..a23d402 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_PART=y CONFIG_CMD_SF=y +# CONFIG_CMD_SF_TEST is not set CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_GPIO=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a1844d3..349d3c7 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_GPIO=y CONFIG_CMD_PCI=y +CONFIG_CMD_READ=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_TFTPSRV=y CONFIG_CMD_RARP=y @@ -193,6 +194,3 @@ CONFIG_UNIT_TEST=y CONFIG_UT_TIME=y CONFIG_UT_DM=y CONFIG_UT_ENV=y -CONFIG_CMD_MTDPARTS=y -CONFIG_CMD_MTDPARTS_SPREAD=y -CONFIG_CMD_READ=y diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h index 4a6b665..fa26363 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86.h @@ -9,8 +9,6 @@ #include <configs/x86-common.h> -#undef CONFIG_CMD_SF_TEST - #undef CONFIG_TPM_TIS_BASE_ADDRESS #undef CONFIG_SCSI_AHCI diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index beb5a12..13777ab 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -52,7 +52,6 @@ #define CONFIG_ENV_SIZE 8192 /* SPI - enable all SPI flash types for testing purposes */ -#define CONFIG_CMD_SF_TEST #define CONFIG_I2C_EDID diff --git a/include/configs/veyron.h b/include/configs/veyron.h index 3f236aa..3a5fc06 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -17,8 +17,6 @@ #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPI_FLASH_GIGADEVICE -#define CONFIG_CMD_SF_TEST - #define CONFIG_KEYBOARD #endif diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index f5f7a92..43af193 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -107,7 +107,6 @@ /*----------------------------------------------------------------------- * FLASH configuration */ -#define CONFIG_CMD_SF_TEST #define CONFIG_SPI /*----------------------------------------------------------------------- diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 885253a..cd47dbc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -293,7 +293,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_SF_TEST CONFIG_CMD_SH_ZIMAGEBOOT CONFIG_CMD_SPL CONFIG_CMD_SPL_NAND_OFS |