Commit ee8da596eba60dcf55dcb30b5288336c53919c99
1 parent
f18845c27a
Exists in
smarc_8mq_lf_v2020.04
and in
9 other branches
sandbox: Remove sandbox_noblk build
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. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
Showing 3 changed files with 1 additions and 191 deletions Side-by-side Diff
board/sandbox/MAINTAINERS
... | ... | @@ -13,13 +13,6 @@ |
13 | 13 | F: include/configs/sandbox.h |
14 | 14 | F: configs/sandbox64_defconfig |
15 | 15 | |
16 | -SANDBOX_NOBLK BOARD | |
17 | -M: Simon Glass <sjg@chromium.org> | |
18 | -S: Maintained | |
19 | -F: board/sandbox/ | |
20 | -F: include/configs/sandbox.h | |
21 | -F: configs/sandbox_noblk_defconfig | |
22 | - | |
23 | 16 | SANDBOX SPL BOARD |
24 | 17 | M: Simon Glass <sjg@chromium.org> |
25 | 18 | S: Maintained |
configs/sandbox_noblk_defconfig
1 | -CONFIG_SYS_TEXT_BASE=0 | |
2 | -CONFIG_NR_DRAM_BANKS=1 | |
3 | -CONFIG_BOOTSTAGE_STASH_ADDR=0x0 | |
4 | -CONFIG_DISTRO_DEFAULTS=y | |
5 | -CONFIG_FIT=y | |
6 | -CONFIG_FIT_SIGNATURE=y | |
7 | -CONFIG_FIT_VERBOSE=y | |
8 | -CONFIG_BOOTSTAGE=y | |
9 | -CONFIG_BOOTSTAGE_REPORT=y | |
10 | -CONFIG_BOOTSTAGE_FDT=y | |
11 | -CONFIG_BOOTSTAGE_STASH=y | |
12 | -CONFIG_BOOTSTAGE_STASH_SIZE=0x4096 | |
13 | -# CONFIG_USE_BOOTCOMMAND is not set | |
14 | -CONFIG_CONSOLE_RECORD=y | |
15 | -CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 | |
16 | -CONFIG_SILENT_CONSOLE=y | |
17 | -CONFIG_DISPLAY_BOARDINFO_LATE=y | |
18 | -# CONFIG_AVB_VERIFY is not set | |
19 | -CONFIG_CMD_CPU=y | |
20 | -CONFIG_CMD_LICENSE=y | |
21 | -CONFIG_CMD_BOOTZ=y | |
22 | -# CONFIG_CMD_ELF is not set | |
23 | -CONFIG_CMD_ASKENV=y | |
24 | -CONFIG_CMD_GREPENV=y | |
25 | -CONFIG_CMD_ENV_CALLBACK=y | |
26 | -CONFIG_CMD_ENV_FLAGS=y | |
27 | -CONFIG_LOOPW=y | |
28 | -CONFIG_CMD_MD5SUM=y | |
29 | -CONFIG_CMD_MEMINFO=y | |
30 | -CONFIG_CMD_MEMTEST=y | |
31 | -CONFIG_CMD_MX_CYCLIC=y | |
32 | -CONFIG_CMD_DEMO=y | |
33 | -CONFIG_CMD_GPIO=y | |
34 | -CONFIG_CMD_GPT=y | |
35 | -CONFIG_CMD_IDE=y | |
36 | -CONFIG_CMD_I2C=y | |
37 | -CONFIG_CMD_OSD=y | |
38 | -CONFIG_CMD_PCI=y | |
39 | -CONFIG_CMD_REMOTEPROC=y | |
40 | -CONFIG_CMD_SPI=y | |
41 | -CONFIG_CMD_USB=y | |
42 | -CONFIG_CMD_TFTPPUT=y | |
43 | -CONFIG_CMD_TFTPSRV=y | |
44 | -CONFIG_CMD_RARP=y | |
45 | -CONFIG_CMD_CDP=y | |
46 | -CONFIG_CMD_SNTP=y | |
47 | -CONFIG_CMD_DNS=y | |
48 | -CONFIG_CMD_LINK_LOCAL=y | |
49 | -CONFIG_CMD_BMP=y | |
50 | -CONFIG_CMD_TIME=y | |
51 | -CONFIG_CMD_TIMER=y | |
52 | -CONFIG_CMD_SOUND=y | |
53 | -CONFIG_CMD_BOOTSTAGE=y | |
54 | -CONFIG_CMD_PMIC=y | |
55 | -CONFIG_CMD_REGULATOR=y | |
56 | -CONFIG_CMD_TPM=y | |
57 | -CONFIG_CMD_TPM_TEST=y | |
58 | -CONFIG_CMD_CBFS=y | |
59 | -CONFIG_CMD_CRAMFS=y | |
60 | -CONFIG_CMD_EXT4_WRITE=y | |
61 | -CONFIG_MAC_PARTITION=y | |
62 | -CONFIG_AMIGA_PARTITION=y | |
63 | -CONFIG_OF_CONTROL=y | |
64 | -CONFIG_OF_HOSTFILE=y | |
65 | -CONFIG_DEFAULT_DEVICE_TREE="sandbox" | |
66 | -CONFIG_NETCONSOLE=y | |
67 | -CONFIG_IP_DEFRAG=y | |
68 | -CONFIG_REGMAP=y | |
69 | -CONFIG_SYSCON=y | |
70 | -CONFIG_DEVRES=y | |
71 | -CONFIG_DEBUG_DEVRES=y | |
72 | -CONFIG_ADC=y | |
73 | -CONFIG_ADC_SANDBOX=y | |
74 | -# CONFIG_BLK is not set | |
75 | -CONFIG_CLK=y | |
76 | -CONFIG_CPU=y | |
77 | -CONFIG_DM_DEMO=y | |
78 | -CONFIG_DM_DEMO_SIMPLE=y | |
79 | -CONFIG_DM_DEMO_SHAPE=y | |
80 | -CONFIG_BOARD=y | |
81 | -CONFIG_BOARD_SANDBOX=y | |
82 | -CONFIG_PM8916_GPIO=y | |
83 | -CONFIG_SANDBOX_GPIO=y | |
84 | -CONFIG_I2C_CROS_EC_TUNNEL=y | |
85 | -CONFIG_I2C_CROS_EC_LDO=y | |
86 | -CONFIG_DM_I2C_GPIO=y | |
87 | -CONFIG_SYS_I2C_SANDBOX=y | |
88 | -CONFIG_I2C_MUX=y | |
89 | -CONFIG_SPL_I2C_MUX=y | |
90 | -CONFIG_I2C_ARB_GPIO_CHALLENGE=y | |
91 | -CONFIG_CROS_EC_KEYB=y | |
92 | -CONFIG_I8042_KEYB=y | |
93 | -CONFIG_LED=y | |
94 | -CONFIG_LED_BLINK=y | |
95 | -CONFIG_LED_GPIO=y | |
96 | -CONFIG_CROS_EC=y | |
97 | -CONFIG_CROS_EC_I2C=y | |
98 | -CONFIG_CROS_EC_LPC=y | |
99 | -CONFIG_CROS_EC_SANDBOX=y | |
100 | -CONFIG_CROS_EC_SPI=y | |
101 | -CONFIG_PWRSEQ=y | |
102 | -CONFIG_SPL_PWRSEQ=y | |
103 | -# CONFIG_MMC is not set | |
104 | -CONFIG_SPI_FLASH_SANDBOX=y | |
105 | -CONFIG_SPI_FLASH=y | |
106 | -CONFIG_SPI_FLASH_ATMEL=y | |
107 | -CONFIG_SPI_FLASH_EON=y | |
108 | -CONFIG_SPI_FLASH_GIGADEVICE=y | |
109 | -CONFIG_SPI_FLASH_MACRONIX=y | |
110 | -CONFIG_SPI_FLASH_SPANSION=y | |
111 | -CONFIG_SPI_FLASH_STMICRO=y | |
112 | -CONFIG_SPI_FLASH_SST=y | |
113 | -CONFIG_SPI_FLASH_WINBOND=y | |
114 | -CONFIG_DM_ETH=y | |
115 | -CONFIG_PCI=y | |
116 | -CONFIG_DM_PCI=y | |
117 | -CONFIG_DM_PCI_COMPAT=y | |
118 | -CONFIG_PCI_SANDBOX=y | |
119 | -CONFIG_PHY=y | |
120 | -CONFIG_PHY_SANDBOX=y | |
121 | -CONFIG_PINCTRL=y | |
122 | -CONFIG_PINCONF=y | |
123 | -CONFIG_PINCTRL_SANDBOX=y | |
124 | -CONFIG_DM_PMIC=y | |
125 | -CONFIG_PMIC_ACT8846=y | |
126 | -CONFIG_DM_PMIC_PFUZE100=y | |
127 | -CONFIG_DM_PMIC_MAX77686=y | |
128 | -CONFIG_PMIC_PM8916=y | |
129 | -CONFIG_PMIC_RK8XX=y | |
130 | -CONFIG_PMIC_S2MPS11=y | |
131 | -CONFIG_DM_PMIC_SANDBOX=y | |
132 | -CONFIG_PMIC_S5M8767=y | |
133 | -CONFIG_PMIC_TPS65090=y | |
134 | -CONFIG_DM_REGULATOR=y | |
135 | -CONFIG_REGULATOR_ACT8846=y | |
136 | -CONFIG_DM_REGULATOR_PFUZE100=y | |
137 | -CONFIG_DM_REGULATOR_MAX77686=y | |
138 | -CONFIG_DM_REGULATOR_FIXED=y | |
139 | -CONFIG_REGULATOR_RK8XX=y | |
140 | -CONFIG_REGULATOR_S5M8767=y | |
141 | -CONFIG_DM_REGULATOR_SANDBOX=y | |
142 | -CONFIG_REGULATOR_TPS65090=y | |
143 | -CONFIG_DM_PWM=y | |
144 | -CONFIG_PWM_SANDBOX=y | |
145 | -CONFIG_RAM=y | |
146 | -CONFIG_REMOTEPROC_SANDBOX=y | |
147 | -CONFIG_DM_RTC=y | |
148 | -CONFIG_SANDBOX_SERIAL=y | |
149 | -CONFIG_SOUND=y | |
150 | -CONFIG_SOUND_SANDBOX=y | |
151 | -CONFIG_SANDBOX_SPI=y | |
152 | -CONFIG_SPMI=y | |
153 | -CONFIG_SPMI_SANDBOX=y | |
154 | -CONFIG_SYSRESET=y | |
155 | -CONFIG_TIMER=y | |
156 | -CONFIG_TIMER_EARLY=y | |
157 | -CONFIG_SANDBOX_TIMER=y | |
158 | -CONFIG_USB=y | |
159 | -CONFIG_DM_USB=y | |
160 | -CONFIG_USB_EMUL=y | |
161 | -CONFIG_USB_KEYBOARD=y | |
162 | -CONFIG_DM_VIDEO=y | |
163 | -CONFIG_CONSOLE_ROTATION=y | |
164 | -CONFIG_CONSOLE_TRUETYPE=y | |
165 | -CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y | |
166 | -CONFIG_VIDEO_SANDBOX_SDL=y | |
167 | -CONFIG_OSD=y | |
168 | -CONFIG_SANDBOX_OSD=y | |
169 | -# CONFIG_VIRTIO_BLK is not set | |
170 | -CONFIG_FS_CBFS=y | |
171 | -CONFIG_FS_CRAMFS=y | |
172 | -CONFIG_CMD_DHRYSTONE=y | |
173 | -CONFIG_TPM=y | |
174 | -CONFIG_LZ4=y | |
175 | -CONFIG_ERRNO_STR=y | |
176 | -CONFIG_UNIT_TEST=y | |
177 | -CONFIG_UT_TIME=y | |
178 | -CONFIG_UT_DM=y |
doc/arch/sandbox.rst
... | ... | @@ -209,17 +209,12 @@ |
209 | 209 | We need this build so that we can test those inline functions, and we |
210 | 210 | cannot build with both the inline functions and the non-inline functions |
211 | 211 | since they are named the same. |
212 | -sandbox_noblk: | |
213 | - builds without CONFIG_BLK, which means the legacy block | |
214 | - drivers are used. We cannot use both the legacy and driver-model block | |
215 | - drivers since they implement the same functions | |
216 | 212 | sandbox_spl: |
217 | 213 | builds sandbox with SPL support, so you can run spl/u-boot-spl |
218 | 214 | and it will start up and then load ./u-boot. It is also possible to |
219 | 215 | run ./u-boot directly. |
220 | 216 | |
221 | -Of these sandbox_noblk can be removed once CONFIG_BLK is used everwhere, and | |
222 | -sandbox_spl can probably be removed since it is a superset of sandbox. | |
217 | +Of these sandbox_spl can probably be removed since it is a superset of sandbox. | |
223 | 218 | |
224 | 219 | Most of the config options should be identical between these variants. |
225 | 220 |