At this point, all drivers that do not use CONFIG_BLK are past their migration deadlines, so remove this config as it's no longer helpful and hinders enhancing block drivers.
Cc: Simon Glass sjg@chromium.org Cc: Faiz Abbas faiz_abbas@ti.com Signed-off-by: Tom Rini trini@konsulko.com --- This is required for Faiz's series that adds UFS support to SCSI as that breaks the non-BLK case. This path seems the most reasonable at this point in time. --- board/sandbox/MAINTAINERS | 7 -- configs/sandbox_noblk_defconfig | 178 -------------------------------- doc/arch/sandbox.rst | 7 +- 3 files changed, 1 insertion(+), 191 deletions(-) delete mode 100644 configs/sandbox_noblk_defconfig
diff --git a/board/sandbox/MAINTAINERS b/board/sandbox/MAINTAINERS index df29abe7aa7a..433be48a6f12 100644 --- a/board/sandbox/MAINTAINERS +++ b/board/sandbox/MAINTAINERS @@ -13,13 +13,6 @@ F: board/sandbox/ F: include/configs/sandbox.h F: configs/sandbox64_defconfig
-SANDBOX_NOBLK BOARD -M: Simon Glass sjg@chromium.org -S: Maintained -F: board/sandbox/ -F: include/configs/sandbox.h -F: configs/sandbox_noblk_defconfig - SANDBOX SPL BOARD M: Simon Glass sjg@chromium.org S: Maintained diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig deleted file mode 100644 index 381bad2003e3..000000000000 --- a/configs/sandbox_noblk_defconfig +++ /dev/null @@ -1,178 +0,0 @@ -CONFIG_SYS_TEXT_BASE=0 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_FIT=y -CONFIG_FIT_SIGNATURE=y -CONFIG_FIT_VERBOSE=y -CONFIG_BOOTSTAGE=y -CONFIG_BOOTSTAGE_REPORT=y -CONFIG_BOOTSTAGE_FDT=y -CONFIG_BOOTSTAGE_STASH=y -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 -# CONFIG_USE_BOOTCOMMAND is not set -CONFIG_CONSOLE_RECORD=y -CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 -CONFIG_SILENT_CONSOLE=y -CONFIG_DISPLAY_BOARDINFO_LATE=y -# CONFIG_AVB_VERIFY is not set -CONFIG_CMD_CPU=y -CONFIG_CMD_LICENSE=y -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_ELF is not set -CONFIG_CMD_ASKENV=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_ENV_CALLBACK=y -CONFIG_CMD_ENV_FLAGS=y -CONFIG_LOOPW=y -CONFIG_CMD_MD5SUM=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_MX_CYCLIC=y -CONFIG_CMD_DEMO=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -CONFIG_CMD_IDE=y -CONFIG_CMD_I2C=y -CONFIG_CMD_OSD=y -CONFIG_CMD_PCI=y -CONFIG_CMD_REMOTEPROC=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_TFTPSRV=y -CONFIG_CMD_RARP=y -CONFIG_CMD_CDP=y -CONFIG_CMD_SNTP=y -CONFIG_CMD_DNS=y -CONFIG_CMD_LINK_LOCAL=y -CONFIG_CMD_BMP=y -CONFIG_CMD_TIME=y -CONFIG_CMD_TIMER=y -CONFIG_CMD_SOUND=y -CONFIG_CMD_BOOTSTAGE=y -CONFIG_CMD_PMIC=y -CONFIG_CMD_REGULATOR=y -CONFIG_CMD_TPM=y -CONFIG_CMD_TPM_TEST=y -CONFIG_CMD_CBFS=y -CONFIG_CMD_CRAMFS=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_MAC_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_OF_CONTROL=y -CONFIG_OF_HOSTFILE=y -CONFIG_DEFAULT_DEVICE_TREE="sandbox" -CONFIG_NETCONSOLE=y -CONFIG_IP_DEFRAG=y -CONFIG_REGMAP=y -CONFIG_SYSCON=y -CONFIG_DEVRES=y -CONFIG_DEBUG_DEVRES=y -CONFIG_ADC=y -CONFIG_ADC_SANDBOX=y -# CONFIG_BLK is not set -CONFIG_CLK=y -CONFIG_CPU=y -CONFIG_DM_DEMO=y -CONFIG_DM_DEMO_SIMPLE=y -CONFIG_DM_DEMO_SHAPE=y -CONFIG_BOARD=y -CONFIG_BOARD_SANDBOX=y -CONFIG_PM8916_GPIO=y -CONFIG_SANDBOX_GPIO=y -CONFIG_I2C_CROS_EC_TUNNEL=y -CONFIG_I2C_CROS_EC_LDO=y -CONFIG_DM_I2C_GPIO=y -CONFIG_SYS_I2C_SANDBOX=y -CONFIG_I2C_MUX=y -CONFIG_SPL_I2C_MUX=y -CONFIG_I2C_ARB_GPIO_CHALLENGE=y -CONFIG_CROS_EC_KEYB=y -CONFIG_I8042_KEYB=y -CONFIG_LED=y -CONFIG_LED_BLINK=y -CONFIG_LED_GPIO=y -CONFIG_CROS_EC=y -CONFIG_CROS_EC_I2C=y -CONFIG_CROS_EC_LPC=y -CONFIG_CROS_EC_SANDBOX=y -CONFIG_CROS_EC_SPI=y -CONFIG_PWRSEQ=y -CONFIG_SPL_PWRSEQ=y -# CONFIG_MMC is not set -CONFIG_SPI_FLASH_SANDBOX=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_ATMEL=y -CONFIG_SPI_FLASH_EON=y -CONFIG_SPI_FLASH_GIGADEVICE=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_SST=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_DM_ETH=y -CONFIG_PCI=y -CONFIG_DM_PCI=y -CONFIG_DM_PCI_COMPAT=y -CONFIG_PCI_SANDBOX=y -CONFIG_PHY=y -CONFIG_PHY_SANDBOX=y -CONFIG_PINCTRL=y -CONFIG_PINCONF=y -CONFIG_PINCTRL_SANDBOX=y -CONFIG_DM_PMIC=y -CONFIG_PMIC_ACT8846=y -CONFIG_DM_PMIC_PFUZE100=y -CONFIG_DM_PMIC_MAX77686=y -CONFIG_PMIC_PM8916=y -CONFIG_PMIC_RK8XX=y -CONFIG_PMIC_S2MPS11=y -CONFIG_DM_PMIC_SANDBOX=y -CONFIG_PMIC_S5M8767=y -CONFIG_PMIC_TPS65090=y -CONFIG_DM_REGULATOR=y -CONFIG_REGULATOR_ACT8846=y -CONFIG_DM_REGULATOR_PFUZE100=y -CONFIG_DM_REGULATOR_MAX77686=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_REGULATOR_RK8XX=y -CONFIG_REGULATOR_S5M8767=y -CONFIG_DM_REGULATOR_SANDBOX=y -CONFIG_REGULATOR_TPS65090=y -CONFIG_DM_PWM=y -CONFIG_PWM_SANDBOX=y -CONFIG_RAM=y -CONFIG_REMOTEPROC_SANDBOX=y -CONFIG_DM_RTC=y -CONFIG_SANDBOX_SERIAL=y -CONFIG_SOUND=y -CONFIG_SOUND_SANDBOX=y -CONFIG_SANDBOX_SPI=y -CONFIG_SPMI=y -CONFIG_SPMI_SANDBOX=y -CONFIG_SYSRESET=y -CONFIG_TIMER=y -CONFIG_TIMER_EARLY=y -CONFIG_SANDBOX_TIMER=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_EMUL=y -CONFIG_USB_KEYBOARD=y -CONFIG_DM_VIDEO=y -CONFIG_CONSOLE_ROTATION=y -CONFIG_CONSOLE_TRUETYPE=y -CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y -CONFIG_VIDEO_SANDBOX_SDL=y -CONFIG_OSD=y -CONFIG_SANDBOX_OSD=y -# CONFIG_VIRTIO_BLK is not set -CONFIG_FS_CBFS=y -CONFIG_FS_CRAMFS=y -CONFIG_CMD_DHRYSTONE=y -CONFIG_TPM=y -CONFIG_LZ4=y -CONFIG_ERRNO_STR=y -CONFIG_UNIT_TEST=y -CONFIG_UT_TIME=y -CONFIG_UT_DM=y diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index 54933b56759b..e1f4dde6f86f 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -209,17 +209,12 @@ sandbox_flattree: We need this build so that we can test those inline functions, and we cannot build with both the inline functions and the non-inline functions since they are named the same. -sandbox_noblk: - builds without CONFIG_BLK, which means the legacy block - drivers are used. We cannot use both the legacy and driver-model block - drivers since they implement the same functions sandbox_spl: builds sandbox with SPL support, so you can run spl/u-boot-spl and it will start up and then load ./u-boot. It is also possible to run ./u-boot directly.
-Of these sandbox_noblk can be removed once CONFIG_BLK is used everwhere, and -sandbox_spl can probably be removed since it is a superset of sandbox. +Of these sandbox_spl can probably be removed since it is a superset of sandbox.
Most of the config options should be identical between these variants.