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>

diff --git a/README b/README
index 142dbccec1a5ad76d8ff0ce8a8fa540c0fa4a58b..03ad69a8b6ad0f769b19c6c26f1eaaa137f9d91c 100644 (file)
--- a/README
+++ b/README
@@ -1315,11 +1315,6 @@ The following options need to be configured:
                clock chips. See common/cmd_i2c.c for a description of the
                command line interface.
 
-               CONFIG_I2C_CMD_TREE is a recommended option that places
-               all I2C commands under a single 'i2c' root command.  The
-               older 'imm', 'imd', 'iprobe' etc. commands are considered
-               deprecated and may disappear in the future.
-
                CONFIG_HARD_I2C selects a hardware I2C controller.
 
                CONFIG_SOFT_I2C configures u-boot to use a software (aka

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index c071df732650e5b41a59772683a2bf676121dbd9..fd9f9a44f8169ffcd3c53ea73f80a1b989d768df 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -1204,7 +1204,6 @@ int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 #endif
 
-#if defined(CONFIG_I2C_CMD_TREE)
 int do_i2c_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
@@ -1314,11 +1313,9 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                cmd_usage(cmdtp);
        return 0;
 }
-#endif  /* CONFIG_I2C_CMD_TREE */
 
 /***************************************************/
 
-#if defined(CONFIG_I2C_CMD_TREE)
 U_BOOT_CMD(
        i2c, 6, 1, do_i2c,
        "I2C sub-system",
@@ -1341,61 +1338,6 @@ U_BOOT_CMD(
        "i2c sdram chip - print SDRAM configuration information\n"
 #endif
 );
-#endif /* CONFIG_I2C_CMD_TREE */
-U_BOOT_CMD(
-       imd,    4,      1,      do_i2c_md,              \
-       "i2c memory display",                           \
-       "chip address[.0, .1, .2] [# of objects]\n    - i2c memory display\n" \
-);
-
-U_BOOT_CMD(
-       imm,    3,      1,      do_i2c_mm,
-       "i2c memory modify (auto-incrementing)",
-       "chip address[.0, .1, .2]\n"
-       "    - memory modify, auto increment address\n"
-);
-U_BOOT_CMD(
-       inm,    3,      1,      do_i2c_nm,
-       "memory modify (constant address)",
-       "chip address[.0, .1, .2]\n    - memory modify, read and keep address\n"
-);
-
-U_BOOT_CMD(
-       imw,    5,      1,      do_i2c_mw,
-       "memory write (fill)",
-       "chip address[.0, .1, .2] value [count]\n    - memory write (fill)\n"
-);
-
-U_BOOT_CMD(
-       icrc32, 5,      1,      do_i2c_crc,
-       "checksum calculation",
-       "chip address[.0, .1, .2] count\n    - compute CRC32 checksum\n"
-);
-
-U_BOOT_CMD(
-       iprobe, 1,      1,      do_i2c_probe,
-       "probe to discover valid I2C chip addresses",
-       "\n    -discover valid I2C chip addresses\n"
-);
-
-/*
- * Require full name for "iloop" because it is an infinite loop!
- */
-U_BOOT_CMD(
-       iloop,  5,      1,      do_i2c_loop,
-       "infinite loop on address range",
-       "chip address[.0, .1, .2] [# of objects]\n"
-       "    - loop, reading a set of addresses\n"
-);
-
-#if defined(CONFIG_CMD_SDRAM)
-U_BOOT_CMD(
-       isdram, 2,      1,      do_sdram,
-       "print SDRAM configuration information",
-       "chip\n    - print SDRAM configuration information\n"
-       "      (valid chip values 50..57)\n"
-);
-#endif
 
 #if defined(CONFIG_I2C_MUX)
 

diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt
index b1f0582f7b27bdb112573aef88a5ec8ffd238498..9bbdc0a83226aa1158ddd73d253e4742c0124159 100644 (file)
--- a/doc/feature-removal-schedule.txt
+++ b/doc/feature-removal-schedule.txt
@@ -59,18 +59,6 @@ Who: Wolfgang Denk <wd@denx.de> and board maintainers
 
 ---------------------------
 
-What:  Individual I2C commands
-When:  April 2009
-Why:   Per the U-Boot README, individual I2C commands such as "imd", "imm",
-       "imw", etc are deprecated.  The single "i2c" command which is
-       currently enabled via CONFIG_I2C_CMD_TREE contains the same
-       functionality as the individual I2C commands.  The individual
-       I2C commands should be removed as well as any references to
-       CONFIG_I2C_CMD_TREE.
-Who:   Peter Tyser <ptyser@xes-inc.com>
-
----------------------------
-
 What:  Legacy NAND code
 When:  April 2009
 Why:   Legacy NAND code is deprecated.  Similar functionality exists in

diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index d1edd244b4ef71174a159fb62516c410df513c23..cfb30233185881d578a9547b0ec3b290c0dbd296 100644 (file)
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -211,7 +211,6 @@
 /*-----------------------------------------------------------------------
  * I2C EEPROM (CAT24WC08) for environment
  */
-#define CONFIG_I2C_CMD_TREE     1
 #define CONFIG_HARD_I2C                        /* I2c with hardware support */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index e6abbdc5f3aeaed8e22113cdc782f6ab7d55375f..e9ea1bf7d0878072dc3cad39ccd04ac936f02929 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -170,7 +170,6 @@
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
 #define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
-#define CONFIG_I2C_CMD_TREE     1
 #define CONFIG_I2C_MULTI_BUS    1
 
 #define CONFIG_SYS_SPD_BUS_NUM         0

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 21aedee8722f310a2eafce4cd0ef4d26c785a1cb..52d27a1e40448e5bc76929a8c61f40398bf36724 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -321,7 +321,6 @@
 #define CONFIG_HARD_I2C                        /* I2C with hardware support*/
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {{0,0x69}} /* Don't probe these addrs */

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 2d2799e111c18b4dc87e37bc0170c4b4bc5ddfd8..35ab88f080adb88c0b3ad85b04fca8bb65352c04 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -315,7 +315,6 @@
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {{0,0x69}}      /* Don't probe these addrs */

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index ab6fe55c49b5dd632ff8423a6096c993273ebbab..ef0a09fbd7f92595e74a4fe27f4303d623ba1d13 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -95,7 +95,6 @@
 
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 #define CONFIG_SYS_SPD_BUS_NUM         1       /* The I2C bus for SPD */

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 477a1c5821f628731719465568fe4bed1fa1bab8..138750459d2511cb7a40bbef6827a1e03e2621b6 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -265,7 +265,6 @@
 #undef CONFIG_SOFT_I2C         /* I2C bit-banged */
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED   400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE   0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {{0x52}} /* Don't probe these addrs */

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index bbb448d55fdf9572092e57da5648750c69c1a96c..bc1267f49fcdf3dac2b7965380fba476c63b6017 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_HARD_I2C                /* I2C with hardware support */
 #undef CONFIG_SOFT_I2C         /* I2C bit-banged */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {{0, 0x29}}     /* Don't probe these addrs */

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 77224d98e7b3f86862c8d9295f3fbb6893b4044f..ac340473716da3265454dfa5f79a76904988b307 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -287,7 +287,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_HARD_I2C                /* I2C with hardware support*/
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x52
 #define CONFIG_SYS_I2C_SLAVE           0x7F

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 0ee40c618035b6c1dc585ae6e57124860a7cfb56..77946ceae44aa63e01649de7a523a1843d5b6d10 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -239,7 +239,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_HARD_I2C                /* I2C with hardware support*/
 #undef CONFIG_SOFT_I2C         /* I2C bit-banged */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED   400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE   0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {{0,0x69}}      /* Don't probe these addrs */

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index b60b3641f4873f1082f54ea8c44eed1f0bc9e12c..2aba689664f51880a755d6f2b3defffa160e6892 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -378,7 +378,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_HARD_I2C                /* I2C with hardware support */
 #undef CONFIG_SOFT_I2C         /* I2C bit-banged */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x57
 #define CONFIG_SYS_I2C_SLAVE           0x7F

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 8f741f58bbf8284c458e54b022a7838b305bddf1..9fd27e3d573b9718dda2f7eb9c3f04a0ed5c2680 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -53,7 +53,6 @@
 
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index fc48bc1db65248997f578cc4d2462f66e56699dc..012ae798d18aec1dc381b9ebf23a0e15b1f0554a 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -230,7 +230,6 @@
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
-#define CONFIG_I2C_CMD_TREE    1
 #define CONFIG_I2C_MULTI_BUS   1
 
 #define CONFIG_SYS_I2C_MULTI_EEPROMS

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 79582e16c74c41de392d43bd9e3adabf96a46be3..88ea7c7c93bee261cecad0546abd07f06777549f 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -223,7 +223,6 @@
 #define CONFIG_HARD_I2C                        /* I2C with hardware support*/
 #define CONFIG_FSL_I2C
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #define CONFIG_SYS_I2C_NOPROBES                {{0,0x69}} /* Don't probe these addrs */

diff --git a/include/configs/XPEDITE5200.h b/include/configs/XPEDITE5200.h
index 370aae1c4c692eecb39bd5b2416365e46ee1c97e..89ab69272b5e1211658f14d37e6f0f739aa2bf0e 100644 (file)
--- a/include/configs/XPEDITE5200.h
+++ b/include/configs/XPEDITE5200.h
@@ -226,7 +226,6 @@
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 
 /* I2C EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR             0x50

diff --git a/include/configs/XPEDITE5370.h b/include/configs/XPEDITE5370.h
index a353a14e7dd72523d2bae3df07e984eb16c22b4c..536e0633858d270df9f648d7c38097a5d519f2c2 100644 (file)
--- a/include/configs/XPEDITE5370.h
+++ b/include/configs/XPEDITE5370.h
@@ -244,7 +244,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 
 /* PEX8518 slave I2C interface */
 #define CONFIG_SYS_I2C_PEX8518_ADDR    0x70

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index d87902468ee0c55dc16b65979238e2fbc42a6268..b1420fa8886ff26c431e7e10620906bcfe6ab465 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -287,7 +287,6 @@
 #define CONFIG_HARD_I2C                        /* I2C with hardware support */
 #undef CONFIG_SOFT_I2C                 /* so disable bit-banged I2C */
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #if 0

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index a018873fd685136c7e0345fcd81b856e8c89984d..c898c730467d3c928065a5447d13a42ce813ef41 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -266,7 +266,6 @@
 
 #ifdef CONFIG_HARD_I2C
 #define CONFIG_CMD_I2C
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           0       /* not used */
 #define CONFIG_SYS_I2C_SLAVE           0       /* not used */
 #endif

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 0d89594f20338d51b2778ea24801ed533169166a..3840267312d08f2960c4c991e13fcbec2a57d745 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -129,7 +129,6 @@
 #define CONFIG_SYS_I2C_SPEED           100000  /* I2C speed and slave address  */
 
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_SPD_BUS_NUM         0       /* The I2C bus for SPD          */
 
 #define IIC0_BOOTPROM_ADDR     0x50

diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index b2e37ec22207f7064c67eaadbe4f276895cc192b..0fcf692d18b3d9ff639ab60b2e2b0e002a8ea264 100644 (file)
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -97,7 +97,6 @@
 #define CONFIG_SYS_SLOT_ID_MASK                (0x3f)  /* mask for slot ID bits */
 
 #define CONFIG_I2C_MULTI_BUS   1
-#define CONFIG_I2C_CMD_TREE    1
 #define CONFIG_SYS_MAX_I2C_BUS         2
 #define CONFIG_SYS_I2C_INIT_BOARD      1
 #define CONFIG_I2C_MUX         1

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index f7fc6c5bff47109df22e17191e502285e790f901..61250adfed5a73b242ebc78770ca6fa8c8fa576f 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -314,7 +314,6 @@
 #define CONFIG_SYS_I2C_SLAVE   0x7F
 #define CONFIG_SYS_I2C_OFFSET  0x3000
 #define CONFIG_I2C_MULTI_BUS   1
-#define CONFIG_I2C_CMD_TREE    1
 #define CONFIG_SYS_MAX_I2C_BUS         2
 #define CONFIG_I2C_MUX         1
 

diff --git a/include/configs/korat.h b/include/configs/korat.h
index eb2c1d43b4996799e9e8191067558990b639bb67..ea6ba8938d7b6463e1408b206dd900a3c4c8e0b1 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -282,7 +282,6 @@
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_I2C
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NET

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index edd928d81b5da112ffa092a01f277efc51549655..b89fe12c566795d791ac9f6f7278567c2a75930f 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -279,7 +279,6 @@
 #define CONFIG_HARD_I2C                        /* I2C with hardware support*/
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
 #define CONFIG_FSL_I2C
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 #define CONFIG_SYS_I2C_NOPROBES        {0x69}  /* Don't probe these addrs */

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index becd13eace3fc55c8fb024e08ec7918edff58c22..5b91b4d7c7f5bea278ef7998b2bcd3bc3f231ef3 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -243,7 +243,6 @@
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 
 /* I2C RTC */