Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d48eb5131d287f52bb85b4c58c8680a2e8e3b641

Authored by Peter Tyser
Committed by Wolfgang Denk
1 parent 655b34a78a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

i2c: Remove deprecated individual i2c commands 

The following individual I2C commands have been removed: imd, imm, inm,
imw, icrc32, iprobe, iloop, isdram.

The functionality of the individual commands is still available via
the 'i2c' command.

This change only has an impact on those boards which did not have
CONFIG_I2C_CMD_TREE defined.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

Showing 26 changed files with 0 additions and 98 deletions Side-by-side Diff

... ... @@ -1315,11 +1315,6 @@
1315 1315 clock chips. See common/cmd_i2c.c for a description of the
1316 1316 command line interface.
1317 1317  
1318   - CONFIG_I2C_CMD_TREE is a recommended option that places
1319   - all I2C commands under a single 'i2c' root command. The
1320   - older 'imm', 'imd', 'iprobe' etc. commands are considered
1321   - deprecated and may disappear in the future.
1322   -
1323 1318 CONFIG_HARD_I2C selects a hardware I2C controller.
1324 1319  
1325 1320 CONFIG_SOFT_I2C configures u-boot to use a software (aka
... ... @@ -1204,7 +1204,6 @@
1204 1204 }
1205 1205 #endif
1206 1206  
1207   -#if defined(CONFIG_I2C_CMD_TREE)
1208 1207 int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
1209 1208 {
1210 1209 i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
1211 1210  
... ... @@ -1314,11 +1313,9 @@
1314 1313 cmd_usage(cmdtp);
1315 1314 return 0;
1316 1315 }
1317   -#endif /* CONFIG_I2C_CMD_TREE */
1318 1316  
1319 1317 /***************************************************/
1320 1318  
1321   -#if defined(CONFIG_I2C_CMD_TREE)
1322 1319 U_BOOT_CMD(
1323 1320 i2c, 6, 1, do_i2c,
1324 1321 "I2C sub-system",
... ... @@ -1341,61 +1338,6 @@
1341 1338 "i2c sdram chip - print SDRAM configuration information\n"
1342 1339 #endif
1343 1340 );
1344   -#endif /* CONFIG_I2C_CMD_TREE */
1345   -U_BOOT_CMD(
1346   - imd, 4, 1, do_i2c_md, \
1347   - "i2c memory display", \
1348   - "chip address[.0, .1, .2] [# of objects]\n - i2c memory display\n" \
1349   -);
1350   -
1351   -U_BOOT_CMD(
1352   - imm, 3, 1, do_i2c_mm,
1353   - "i2c memory modify (auto-incrementing)",
1354   - "chip address[.0, .1, .2]\n"
1355   - " - memory modify, auto increment address\n"
1356   -);
1357   -U_BOOT_CMD(
1358   - inm, 3, 1, do_i2c_nm,
1359   - "memory modify (constant address)",
1360   - "chip address[.0, .1, .2]\n - memory modify, read and keep address\n"
1361   -);
1362   -
1363   -U_BOOT_CMD(
1364   - imw, 5, 1, do_i2c_mw,
1365   - "memory write (fill)",
1366   - "chip address[.0, .1, .2] value [count]\n - memory write (fill)\n"
1367   -);
1368   -
1369   -U_BOOT_CMD(
1370   - icrc32, 5, 1, do_i2c_crc,
1371   - "checksum calculation",
1372   - "chip address[.0, .1, .2] count\n - compute CRC32 checksum\n"
1373   -);
1374   -
1375   -U_BOOT_CMD(
1376   - iprobe, 1, 1, do_i2c_probe,
1377   - "probe to discover valid I2C chip addresses",
1378   - "\n -discover valid I2C chip addresses\n"
1379   -);
1380   -
1381   -/*
1382   - * Require full name for "iloop" because it is an infinite loop!
1383   - */
1384   -U_BOOT_CMD(
1385   - iloop, 5, 1, do_i2c_loop,
1386   - "infinite loop on address range",
1387   - "chip address[.0, .1, .2] [# of objects]\n"
1388   - " - loop, reading a set of addresses\n"
1389   -);
1390   -
1391   -#if defined(CONFIG_CMD_SDRAM)
1392   -U_BOOT_CMD(
1393   - isdram, 2, 1, do_sdram,
1394   - "print SDRAM configuration information",
1395   - "chip\n - print SDRAM configuration information\n"
1396   - " (valid chip values 50..57)\n"
1397   -);
1398   -#endif
1399 1341  
1400 1342 #if defined(CONFIG_I2C_MUX)
1401 1343  
doc/feature-removal-schedule.txt
Diff comments   View file @ d48eb51
... ... @@ -59,18 +59,6 @@
59 59  
60 60 ---------------------------
61 61  
62   -What: Individual I2C commands
63   -When: April 2009
64   -Why: Per the U-Boot README, individual I2C commands such as "imd", "imm",
65   - "imw", etc are deprecated. The single "i2c" command which is
66   - currently enabled via CONFIG_I2C_CMD_TREE contains the same
67   - functionality as the individual I2C commands. The individual
68   - I2C commands should be removed as well as any references to
69   - CONFIG_I2C_CMD_TREE.
70   -Who: Peter Tyser <ptyser@xes-inc.com>
71   -
72   ----------------------------
73   -
74 62 What: Legacy NAND code
75 63 When: April 2009
76 64 Why: Legacy NAND code is deprecated. Similar functionality exists in
include/configs/DU405.h
Diff comments   View file @ d48eb51
... ... @@ -211,7 +211,6 @@
211 211 /*-----------------------------------------------------------------------
212 212 * I2C EEPROM (CAT24WC08) for environment
213 213 */
214   -#define CONFIG_I2C_CMD_TREE 1
215 214 #define CONFIG_HARD_I2C /* I2c with hardware support */
216 215 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
217 216 #define CONFIG_SYS_I2C_SLAVE 0x7F
include/configs/DU440.h
Diff comments   View file @ d48eb51
... ... @@ -170,7 +170,6 @@
170 170 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
171 171 #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */
172 172 #define CONFIG_SYS_I2C_SLAVE 0x7F
173   -#define CONFIG_I2C_CMD_TREE 1
174 173 #define CONFIG_I2C_MULTI_BUS 1
175 174  
176 175 #define CONFIG_SYS_SPD_BUS_NUM 0
include/configs/MPC8313ERDB.h
Diff comments   View file @ d48eb51
... ... @@ -321,7 +321,6 @@
321 321 #define CONFIG_HARD_I2C /* I2C with hardware support*/
322 322 #define CONFIG_FSL_I2C
323 323 #define CONFIG_I2C_MULTI_BUS
324   -#define CONFIG_I2C_CMD_TREE
325 324 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
326 325 #define CONFIG_SYS_I2C_SLAVE 0x7F
327 326 #define CONFIG_SYS_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */
include/configs/MPC8349EMDS.h
Diff comments   View file @ d48eb51
... ... @@ -315,7 +315,6 @@
315 315 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
316 316 #define CONFIG_FSL_I2C
317 317 #define CONFIG_I2C_MULTI_BUS
318   -#define CONFIG_I2C_CMD_TREE
319 318 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
320 319 #define CONFIG_SYS_I2C_SLAVE 0x7F
321 320 #define CONFIG_SYS_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */
include/configs/MPC8349ITX.h
Diff comments   View file @ d48eb51
... ... @@ -95,7 +95,6 @@
95 95  
96 96 #define CONFIG_FSL_I2C
97 97 #define CONFIG_I2C_MULTI_BUS
98   -#define CONFIG_I2C_CMD_TREE
99 98 #define CONFIG_SYS_I2C_OFFSET 0x3000
100 99 #define CONFIG_SYS_I2C2_OFFSET 0x3100
101 100 #define CONFIG_SYS_SPD_BUS_NUM 1 /* The I2C bus for SPD */
include/configs/MPC8360ERDK.h
Diff comments   View file @ d48eb51
... ... @@ -265,7 +265,6 @@
265 265 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
266 266 #define CONFIG_FSL_I2C
267 267 #define CONFIG_I2C_MULTI_BUS
268   -#define CONFIG_I2C_CMD_TREE
269 268 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
270 269 #define CONFIG_SYS_I2C_SLAVE 0x7F
271 270 #define CONFIG_SYS_I2C_NOPROBES {{0x52}} /* Don't probe these addrs */
include/configs/MPC8536DS.h
Diff comments   View file @ d48eb51
... ... @@ -337,7 +337,6 @@
337 337 #define CONFIG_HARD_I2C /* I2C with hardware support */
338 338 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
339 339 #define CONFIG_I2C_MULTI_BUS
340   -#define CONFIG_I2C_CMD_TREE
341 340 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
342 341 #define CONFIG_SYS_I2C_SLAVE 0x7F
343 342 #define CONFIG_SYS_I2C_NOPROBES {{0, 0x29}} /* Don't probe these addrs */
include/configs/MPC8568MDS.h
Diff comments   View file @ d48eb51
... ... @@ -287,7 +287,6 @@
287 287 #define CONFIG_HARD_I2C /* I2C with hardware support*/
288 288 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
289 289 #define CONFIG_I2C_MULTI_BUS
290   -#define CONFIG_I2C_CMD_TREE
291 290 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
292 291 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52
293 292 #define CONFIG_SYS_I2C_SLAVE 0x7F
include/configs/MPC8569MDS.h
Diff comments   View file @ d48eb51
... ... @@ -239,7 +239,6 @@
239 239 #define CONFIG_HARD_I2C /* I2C with hardware support*/
240 240 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
241 241 #define CONFIG_I2C_MULTI_BUS
242   -#define CONFIG_I2C_CMD_TREE
243 242 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
244 243 #define CONFIG_SYS_I2C_SLAVE 0x7F
245 244 #define CONFIG_SYS_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */
include/configs/MPC8572DS.h
Diff comments   View file @ d48eb51
... ... @@ -378,7 +378,6 @@
378 378 #define CONFIG_HARD_I2C /* I2C with hardware support */
379 379 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
380 380 #define CONFIG_I2C_MULTI_BUS
381   -#define CONFIG_I2C_CMD_TREE
382 381 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
383 382 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
384 383 #define CONFIG_SYS_I2C_SLAVE 0x7F
include/configs/MVBLM7.h
Diff comments   View file @ d48eb51
... ... @@ -53,7 +53,6 @@
53 53  
54 54 #define CONFIG_FSL_I2C
55 55 #define CONFIG_I2C_MULTI_BUS
56   -#define CONFIG_I2C_CMD_TREE
57 56 #define CONFIG_SYS_I2C_OFFSET 0x3000
58 57 #define CONFIG_SYS_I2C2_OFFSET 0x3100
59 58  
include/configs/PMC440.h
Diff comments   View file @ d48eb51
... ... @@ -230,7 +230,6 @@
230 230 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
231 231 #define CONFIG_SYS_I2C_SLAVE 0x7F
232 232  
233   -#define CONFIG_I2C_CMD_TREE 1
234 233 #define CONFIG_I2C_MULTI_BUS 1
235 234  
236 235 #define CONFIG_SYS_I2C_MULTI_EEPROMS
include/configs/SIMPC8313.h
Diff comments   View file @ d48eb51
... ... @@ -223,7 +223,6 @@
223 223 #define CONFIG_HARD_I2C /* I2C with hardware support*/
224 224 #define CONFIG_FSL_I2C
225 225 #define CONFIG_I2C_MULTI_BUS
226   -#define CONFIG_I2C_CMD_TREE
227 226 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
228 227 #define CONFIG_SYS_I2C_SLAVE 0x7F
229 228 #define CONFIG_SYS_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */
include/configs/XPEDITE5200.h
Diff comments   View file @ d48eb51
... ... @@ -226,7 +226,6 @@
226 226 #define CONFIG_SYS_I2C_OFFSET 0x3000
227 227 #define CONFIG_SYS_I2C2_OFFSET 0x3100
228 228 #define CONFIG_I2C_MULTI_BUS
229   -#define CONFIG_I2C_CMD_TREE
230 229  
231 230 /* I2C EEPROM */
232 231 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
include/configs/XPEDITE5370.h
Diff comments   View file @ d48eb51
... ... @@ -244,7 +244,6 @@
244 244 #define CONFIG_SYS_I2C_OFFSET 0x3000
245 245 #define CONFIG_SYS_I2C2_OFFSET 0x3100
246 246 #define CONFIG_I2C_MULTI_BUS
247   -#define CONFIG_I2C_CMD_TREE
248 247  
249 248 /* PEX8518 slave I2C interface */
250 249 #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70
include/configs/ads5121.h
Diff comments   View file @ d48eb51
... ... @@ -287,7 +287,6 @@
287 287 #define CONFIG_HARD_I2C /* I2C with hardware support */
288 288 #undef CONFIG_SOFT_I2C /* so disable bit-banged I2C */
289 289 #define CONFIG_I2C_MULTI_BUS
290   -#define CONFIG_I2C_CMD_TREE
291 290 #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */
292 291 #define CONFIG_SYS_I2C_SLAVE 0x7F
293 292 #if 0
include/configs/at91rm9200ek.h
Diff comments   View file @ d48eb51
... ... @@ -266,7 +266,6 @@
266 266  
267 267 #ifdef CONFIG_HARD_I2C
268 268 #define CONFIG_CMD_I2C
269   -#define CONFIG_I2C_CMD_TREE
270 269 #define CONFIG_SYS_I2C_SPEED 0 /* not used */
271 270 #define CONFIG_SYS_I2C_SLAVE 0 /* not used */
272 271 #endif
include/configs/katmai.h
Diff comments   View file @ d48eb51
... ... @@ -129,7 +129,6 @@
129 129 #define CONFIG_SYS_I2C_SPEED 100000 /* I2C speed and slave address */
130 130  
131 131 #define CONFIG_I2C_MULTI_BUS
132   -#define CONFIG_I2C_CMD_TREE
133 132 #define CONFIG_SYS_SPD_BUS_NUM 0 /* The I2C bus for SPD */
134 133  
135 134 #define IIC0_BOOTPROM_ADDR 0x50
include/configs/keymile-common.h
Diff comments   View file @ d48eb51
... ... @@ -97,7 +97,6 @@
97 97 #define CONFIG_SYS_SLOT_ID_MASK (0x3f) /* mask for slot ID bits */
98 98  
99 99 #define CONFIG_I2C_MULTI_BUS 1
100   -#define CONFIG_I2C_CMD_TREE 1
101 100 #define CONFIG_SYS_MAX_I2C_BUS 2
102 101 #define CONFIG_SYS_I2C_INIT_BOARD 1
103 102 #define CONFIG_I2C_MUX 1
include/configs/kmeter1.h
Diff comments   View file @ d48eb51
... ... @@ -314,7 +314,6 @@
314 314 #define CONFIG_SYS_I2C_SLAVE 0x7F
315 315 #define CONFIG_SYS_I2C_OFFSET 0x3000
316 316 #define CONFIG_I2C_MULTI_BUS 1
317   -#define CONFIG_I2C_CMD_TREE 1
318 317 #define CONFIG_SYS_MAX_I2C_BUS 2
319 318 #define CONFIG_I2C_MUX 1
320 319  
include/configs/korat.h
Diff comments   View file @ d48eb51
... ... @@ -282,7 +282,6 @@
282 282 #define CONFIG_CMD_ELF
283 283 #define CONFIG_CMD_FAT
284 284 #define CONFIG_CMD_I2C
285   -#define CONFIG_I2C_CMD_TREE
286 285 #define CONFIG_CMD_IRQ
287 286 #define CONFIG_CMD_MII
288 287 #define CONFIG_CMD_NET
include/configs/sbc8349.h
Diff comments   View file @ d48eb51
... ... @@ -279,7 +279,6 @@
279 279 #define CONFIG_HARD_I2C /* I2C with hardware support*/
280 280 #undef CONFIG_SOFT_I2C /* I2C bit-banged */
281 281 #define CONFIG_FSL_I2C
282   -#define CONFIG_I2C_CMD_TREE
283 282 #define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
284 283 #define CONFIG_SYS_I2C_SLAVE 0x7F
285 284 #define CONFIG_SYS_I2C_NOPROBES {0x69} /* Don't probe these addrs */
include/configs/socrates.h
Diff comments   View file @ d48eb51
... ... @@ -243,7 +243,6 @@
243 243 #define CONFIG_SYS_I2C_OFFSET 0x3000
244 244  
245 245 #define CONFIG_I2C_MULTI_BUS
246   -#define CONFIG_I2C_CMD_TREE
247 246 #define CONFIG_SYS_I2C2_OFFSET 0x3100
248 247  
249 248 /* I2C RTC */