Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d9fc703246840c4b268debf48c334ba55c597dc0

Authored by Matthias Fuchs
Committed by Stefan Roese
1 parent ced5b90290
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

[PATCH] I2C: disable flat i2c commands when CONFIG_I2C_CMD_TREE is defined 

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>

Showing 1 changed file with 20 additions and 20 deletions Side-by-side Diff

... ... @@ -948,7 +948,27 @@
948 948  
949 949 /***************************************************/
950 950  
  951 +#if defined(CONFIG_I2C_CMD_TREE)
951 952 U_BOOT_CMD(
  953 + i2c, 6, 1, do_i2c,
  954 + "i2c - I2C sub-system\n",
  955 +#if defined(CONFIG_I2C_MULTI_BUS)
  956 + "dev [dev] - show or set current I2C bus\n"
  957 +#endif /* CONFIG_I2C_MULTI_BUS */
  958 + "i2c speed [speed] - show or set I2C bus speed\n"
  959 + "i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device\n"
  960 + "i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)\n"
  961 + "i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n"
  962 + "i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n"
  963 + "i2c crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
  964 + "i2c probe - show devices on the I2C bus\n"
  965 + "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
  966 +#if (CONFIG_COMMANDS & CFG_CMD_SDRAM)
  967 + "i2c sdram chip - print SDRAM configuration information\n"
  968 +#endif /* CFG_CMD_SDRAM */
  969 +);
  970 +#else /* CONFIG_I2C_CMD_TREE */
  971 +U_BOOT_CMD(
952 972 imd, 4, 1, do_i2c_md, \
953 973 "imd - i2c memory display\n", \
954 974 "chip address[.0, .1, .2] [# of objects]\n - i2c memory display\n" \
... ... @@ -1002,26 +1022,6 @@
1002 1022 " (valid chip values 50..57)\n"
1003 1023 );
1004 1024 #endif
1005   -
1006   -#if defined(CONFIG_I2C_CMD_TREE)
1007   -U_BOOT_CMD(
1008   - i2c, 6, 1, do_i2c,
1009   - "i2c - I2C sub-system\n",
1010   -#if defined(CONFIG_I2C_MULTI_BUS)
1011   - "dev [dev] - show or set current I2C bus\n"
1012   -#endif /* CONFIG_I2C_MULTI_BUS */
1013   - "i2c speed [speed] - show or set I2C bus speed\n"
1014   - "i2c md chip address[.0, .1, .2] [# of objects] - read from I2C device\n"
1015   - "i2c mm chip address[.0, .1, .2] - write to I2C device (auto-incrementing)\n"
1016   - "i2c mw chip address[.0, .1, .2] value [count] - write to I2C device (fill)\n"
1017   - "i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n"
1018   - "i2c crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
1019   - "i2c probe - show devices on the I2C bus\n"
1020   - "i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
1021   -#if (CONFIG_COMMANDS & CFG_CMD_SDRAM)
1022   - "i2c sdram chip - print SDRAM configuration information\n"
1023   -#endif /* CFG_CMD_SDRAM */
1024   -);
1025 1025 #endif /* CONFIG_I2C_CMD_TREE */
1026 1026  
1027 1027 #endif /* CFG_CMD_I2C */