[U-Boot] [Patch] Disable/Enable Flat I²C Commands

[Jens Scharsig <esw@bus-elektronik.de>]

Since CONFIG_I2C_CMD_TREE are defined, the old flat i2c commands are
still present.
This patch disables the old flat command by default, if
CONFIG_I2C_CMD_TREE is defined.
The new option CONFIG_I2C_CMD_FLAT makes it possible to use the flat
commands in addition of tree commands.

Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
---

diff --git a/README b/README
index 86c1304..3ad6d34 100644
--- a/README
+++ b/README
@@ -1306,6 +1306,9 @@ The following options need to be configured:
 		older 'imm', 'imd', 'iprobe' etc. commands are considered
 		deprecated and may disappear in the future.

+		CONFIG_I2C_CMD_FLAT enable the old flat i2c commands like
+		'imm', 'imd', 'iprobe' etc. if CONFIG_I2C_CMD_TREE is defined.
+
 		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 16439ac..5fec13c 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -1324,6 +1324,7 @@ U_BOOT_CMD(
 #endif
 );
 #endif /* CONFIG_I2C_CMD_TREE */
+#if (defined(CONFIG_I2C_CMD_FLAT) || !defined(CONFIG_I2C_CMD_TREE))
 U_BOOT_CMD(
 	imd,	4,	1,	do_i2c_md,		\
 	"i2c memory display",				\
@@ -1369,6 +1370,7 @@ U_BOOT_CMD(
 	"chip address[.0, .1, .2] [# of objects]\n"
 	"    - loop, reading a set of addresses\n"
 );
+#endif /* CONFIG_I2C_CMD_FLAT/TREE */

 #if defined(CONFIG_CMD_SDRAM)
 U_BOOT_CMD(