Skip to contentSkip to conversation

Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

PATCH In review Simon Goldschmidt 4 participants 12 messages Mar 14, 2019 – Mar 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to eeprom command")

---

 cmd/Kconfig | 1 -
 1 file changed, 1 deletion(-)
cmd/Kconfig +0 -1
index 4bcc5c4557..74c5a1a6ed 100644
@@ -455,7 +455,6 @@ config CRC32_VERIFY
 
 config CMD_EEPROM
 	bool "eeprom - EEPROM subsystem"
-	depends on !DM_I2C || DM_I2C_COMPAT
 	help
 	  (deprecated, needs conversion to driver model)
 	  Provides commands to read and write EEPROM (Electrically Erasable
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

Quoted 1 line · Simon Goldschmidt

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

You should also put subject of that patch here. It is much easier to check what was that.

M

#2 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

Quoted 6 lines · Michal Simek
Quoted 1 line · Simon Goldschmidt

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

You should also put subject of that patch here. It is much easier to check what was that.

The subject of the commit is in the patch's subject line, isn't that enough?

Regards,
Simon

#3 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

Quoted 9 lines · Simon Goldschmidt
Quoted 6 lines · Michal Simek
Quoted 1 line · Simon Goldschmidt

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

You should also put subject of that patch here. It is much easier to check what was that.

The subject of the commit is in the patch's subject line, isn't that enough?

I missed that - it is fine. :-) It is Friday.

Cheers,
Michal

#4 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

In reply to Simon Goldschmidt

Tom,

(adding Lukasz as he authored the DM fix 0c07a9b4078d)

Am 14.03.2019 um 21:57 schrieb Simon Goldschmidt:

Quoted 7 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to eeprom command")

I know it's late in the release cycle, but is there a chance to get this in for v2019.04?

That would allow me to convert I2C and EEPROM access for socfpga in the socfpga-next tree...

Also, I guess adding this now shouldn't be a great risk since it is default off and removing the dependency shouldn't harm.

Thanks,
Simon

Quoted 18 lines

---

  cmd/Kconfig | 1 -
  1 file changed, 1 deletion(-)
cmd/Kconfig +0 -1
index 4bcc5c4557..74c5a1a6ed 100644
@@ -455,7 +455,6 @@ config CRC32_VERIFY
 
  config CMD_EEPROM
  	bool "eeprom - EEPROM subsystem"
-	depends on !DM_I2C || DM_I2C_COMPAT
  	help
  	  (deprecated, needs conversion to driver model)
  	  Provides commands to read and write EEPROM (Electrically Erasable
#5 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

Quoted 14 lines · On Fri, 15 Mar 2019 20:02:25 +0100 Simon Goldschmidt…

Tom,

(adding Lukasz as he authored the DM fix 0c07a9b4078d)

Am 14.03.2019 um 21:57 schrieb Simon Goldschmidt:

Quoted 8 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to eeprom command")

Quoted 8 lines

I know it's late in the release cycle, but is there a chance to get this in for v2019.04?

That would allow me to convert I2C and EEPROM access for socfpga in the socfpga-next tree...

Also, I guess adding this now shouldn't be a great risk since it is default off and removing the dependency shouldn't harm.

If it doesn't cause build breaks - I don't mind.

Quoted 15 lines

Thanks,
Simon

Quoted 11 lines

---

  cmd/Kconfig | 1 -
  1 file changed, 1 deletion(-)
cmd/Kconfig +0 -0
index 4bcc5c4557..74c5a1a6ed 100644
@@ -455,7 +455,6 @@ config CRC32_VERIFY
 
Quoted 8 lines
Quoted 7 lines
cmd/Kconfig +0 -1
  config CMD_EEPROM
  	bool "eeprom - EEPROM subsystem"
-	depends on !DM_I2C || DM_I2C_COMPAT
  	help
  	  (deprecated, needs conversion to driver model)
  	  Provides commands to read and write EEPROM

(Electrically Erasable

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190318/45cf1354/attachment.sig>

#6 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

Hi Lukasz,

Am 18.03.2019 um 08:23 schrieb Lukasz Majewski:

Quoted 20 lines
Quoted 17 lines · On Fri, 15 Mar 2019 20:02:25 +0100 Simon Goldschmidt…

Tom,

(adding Lukasz as he authored the DM fix 0c07a9b4078d)

Am 14.03.2019 um 21:57 schrieb Simon Goldschmidt:

Quoted 8 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to eeprom command")

I know it's late in the release cycle, but is there a chance to get this in for v2019.04?

Quoted 7 lines
Quoted 5 lines

That would allow me to convert I2C and EEPROM access for socfpga in the socfpga-next tree...

Also, I guess adding this now shouldn't be a great risk since it is default off and removing the dependency shouldn't harm.

If it doesn't cause build breaks - I don't mind.

I don't see why this should cause build breaks. It's default off and not selected anywhere: although 101 defconfig files have CONFIG_CMD_EEPROM enabled, none of them has CONFIG_DM_I2C enabled.

Your patch from Nov/Dec 2018 should allow those boards to move to DM_I2C (if the i2c driver supports it) but the commit I want to revert here prevents it soemwhat by depending on legacy code: even DM_I2C_COMPAT is not needed any more after your patch.

Regards,
Simon

Quoted 38 lines
Quoted 16 lines

Thanks,
Simon

Quoted 11 lines

---

   cmd/Kconfig | 1 -
   1 file changed, 1 deletion(-)
cmd/Kconfig +0 -0
index 4bcc5c4557..74c5a1a6ed 100644
@@ -455,7 +455,6 @@ config CRC32_VERIFY
 
Quoted 8 lines
Quoted 7 lines
cmd/Kconfig +0 -1
   config CMD_EEPROM
   	bool "eeprom - EEPROM subsystem"
-	depends on !DM_I2C || DM_I2C_COMPAT
   	help
   	  (deprecated, needs conversion to driver model)
   	  Provides commands to read and write EEPROM

(Electrically Erasable

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de

#7 lore raw

PATCH 1/1 Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT"

Tom,

Am 21.03.2019 um 20:21 schrieb Simon Goldschmidt:

Quoted 31 lines

Hi Lukasz,

Am 18.03.2019 um 08:23 schrieb Lukasz Majewski:

Quoted 20 lines
Quoted 17 lines · On Fri, 15 Mar 2019 20:02:25 +0100 Simon Goldschmidt…

Tom,

(adding Lukasz as he authored the DM fix 0c07a9b4078d)

Am 14.03.2019 um 21:57 schrieb Simon Goldschmidt:

Quoted 8 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to eeprom command")

I know it's late in the release cycle, but is there a chance to get this in for v2019.04?

Quoted 7 lines
Quoted 5 lines

That would allow me to convert I2C and EEPROM access for socfpga in the socfpga-next tree...

Also, I guess adding this now shouldn't be a great risk since it is default off and removing the dependency shouldn't harm.

If it doesn't cause build breaks - I don't mind.

Quoted 8 lines

I don't see why this should cause build breaks. It's default off and not selected anywhere: although 101 defconfig files have CONFIG_CMD_EEPROM enabled, none of them has CONFIG_DM_I2C enabled.

Your patch from Nov/Dec 2018 should allow those boards to move to DM_I2C (if the i2c driver supports it) but the commit I want to revert here prevents it soemwhat by depending on legacy code: even DM_I2C_COMPAT is not needed any more after your patch.

Could this please go in to v2019.04? I'd like to base my patches for socfpga-next on this...

Or should Heiko get this via the i2c tree?

Regards,
Simon

Quoted 43 lines

Regards,
Simon

Quoted 38 lines
Quoted 16 lines

Thanks,
Simon

Quoted 11 lines

---

    cmd/Kconfig | 1 -
    1 file changed, 1 deletion(-)
cmd/Kconfig +0 -0
index 4bcc5c4557..74c5a1a6ed 100644
@@ -455,7 +455,6 @@ config CRC32_VERIFY
 
Quoted 8 lines
Quoted 7 lines
cmd/Kconfig +0 -1
    config CMD_EEPROM
    	bool "eeprom - EEPROM subsystem"
-	depends on !DM_I2C || DM_I2C_COMPAT
    	help
    	  (deprecated, needs conversion to driver model)
    	  Provides commands to read and write EEPROM

(Electrically Erasable

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de

#8 lore raw
In reply to Simon Goldschmidt
Quoted 11 lines · Simon Goldschmidt

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to eeprom command")

---

 cmd/Kconfig | 1 -
 1 file changed, 1 deletion(-)

As is, nope:
make O=/home/jenkins/u-boot/build-am335x_evm -s am335x_evm_defconfig
make O=/home/jenkins/u-boot/build-am335x_evm -s -j8
../cmd/eeprom.c: In function 'eeprom_rw_block':
../cmd/eeprom.c:149:9: warning: implicit declaration of function 'i2c_read'; did you mean 'ide_read'? [-Wimplicit-function-declaration]

   ret = i2c_read(addr[0], offset, alen - 1, buffer, len);
         ^~~~~~~~
         ide_read
../cmd/eeprom.c:151:9: warning: implicit declaration of function 'i2c_write'; did you mean 'ide_write'? [-Wimplicit-function-declaration]
   ret = i2c_write(addr[0], offset, alen - 1, buffer, len);
         ^~~~~~~~~
         ide_write

cmd/built-in.o: In function `eeprom_rw_block':
/home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:149: undefined reference to i2c_read' /home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:151: undefined reference to i2c_write' /home/jenkins/u-boot/Makefile:1497: recipe for target 'u-boot' failed
make[1]: *** [u-boot] Error 1
Makefile:148: recipe for target 'sub-make' failed
make: *** [sub-make] Error 2

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190325/d596d293/attachment.sig>
#9 lore raw

Tom Rini <[email protected]> schrieb am Mo., 25. März 2019, 16:43:

Quoted 29 lines · Simon Goldschmidt
Quoted 6 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to

eeprom command")

Quoted 6 lines

---

 cmd/Kconfig | 1 -
 1 file changed, 1 deletion(-)

As is, nope:
make O=/home/jenkins/u-boot/build-am335x_evm -s am335x_evm_defconfig make O=/home/jenkins/u-boot/build-am335x_evm -s -j8 ../cmd/eeprom.c: In function 'eeprom_rw_block':
../cmd/eeprom.c:149:9: warning: implicit declaration of function 'i2c_read'; did you mean 'ide_read'? [-Wimplicit-function-declaration]

   ret = i2c_read(addr[0], offset, alen - 1, buffer, len);
         ^~~~~~~~
         ide_read
../cmd/eeprom.c:151:9: warning: implicit declaration of function
'i2c_write'; did you mean 'ide_write'? [-Wimplicit-function-declaration]
   ret = i2c_write(addr[0], offset, alen - 1, buffer, len);
         ^~~~~~~~~
         ide_write
Quoted 10 lines

cmd/built-in.o: In function `eeprom_rw_block':
/home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:149: undefined reference to i2c_read' /home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:151: undefined reference to i2c_write' /home/jenkins/u-boot/Makefile:1497: recipe for target 'u-boot' failed make[1]: *** [u-boot] Error 1
Makefile:148: recipe for target 'sub-make' failed
make: *** [sub-make] Error 2

Ehrm, ok, let me check that. Do you have a Travis build with more errors or is this the only one?

Regards,
Simon

#10 lore raw
Quoted 42 lines · Simon Goldschmidt

Tom Rini <[email protected]> schrieb am Mo., 25. März 2019, 16:43:

Quoted 29 lines · Simon Goldschmidt
Quoted 6 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to

eeprom command")

Quoted 6 lines

---

 cmd/Kconfig | 1 -
 1 file changed, 1 deletion(-)

As is, nope:
make O=/home/jenkins/u-boot/build-am335x_evm -s am335x_evm_defconfig make O=/home/jenkins/u-boot/build-am335x_evm -s -j8 ../cmd/eeprom.c: In function 'eeprom_rw_block':
../cmd/eeprom.c:149:9: warning: implicit declaration of function 'i2c_read'; did you mean 'ide_read'? [-Wimplicit-function-declaration]

   ret = i2c_read(addr[0], offset, alen - 1, buffer, len);
         ^~~~~~~~
         ide_read
../cmd/eeprom.c:151:9: warning: implicit declaration of function
'i2c_write'; did you mean 'ide_write'? [-Wimplicit-function-declaration]
   ret = i2c_write(addr[0], offset, alen - 1, buffer, len);
         ^~~~~~~~~
         ide_write
Quoted 10 lines

cmd/built-in.o: In function `eeprom_rw_block':
/home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:149: undefined reference to i2c_read' /home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:151: undefined reference to i2c_write' /home/jenkins/u-boot/Makefile:1497: recipe for target 'u-boot' failed make[1]: *** [u-boot] Error 1
Makefile:148: recipe for target 'sub-make' failed
make: *** [sub-make] Error 2

Quoted 2 lines

Ehrm, ok, let me check that. Do you have a Travis build with more errors or is this the only one?

This was in my local jenkins setup as that's on a board I have and test. There was a travis run but I force-pushed over it to test my branch again.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190325/e9a0dccc/attachment.sig>
#11 lore raw
Quoted 43 lines · Tom Rini
Quoted 42 lines · Simon Goldschmidt

Tom Rini <[email protected]> schrieb am Mo., 25. März 2019, 16:43:

Quoted 39 lines · Simon Goldschmidt
Quoted 6 lines

This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.

The 'eeprom' command has been converted to work with DM_I2C in a patch submitted around the same time as this commit:
commit 0c07a9b4078d ("eeprom: Add device model based I2C support to

eeprom command")

Quoted 6 lines

---

  cmd/Kconfig | 1 -
  1 file changed, 1 deletion(-)

As is, nope:
make O=/home/jenkins/u-boot/build-am335x_evm -s am335x_evm_defconfig make O=/home/jenkins/u-boot/build-am335x_evm -s -j8 ../cmd/eeprom.c: In function 'eeprom_rw_block':
../cmd/eeprom.c:149:9: warning: implicit declaration of function 'i2c_read'; did you mean 'ide_read'? [-Wimplicit-function-declaration]

    ret = i2c_read(addr[0], offset, alen - 1, buffer, len);
          ^~~~~~~~
          ide_read
../cmd/eeprom.c:151:9: warning: implicit declaration of function
'i2c_write'; did you mean 'ide_write'? [-Wimplicit-function-declaration]
    ret = i2c_write(addr[0], offset, alen - 1, buffer, len);
          ^~~~~~~~~
          ide_write

cmd/built-in.o: In function `eeprom_rw_block':
/home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:149: undefined reference to i2c_read' /home/jenkins/u-boot/build-am335x_evm/../cmd/eeprom.c:151: undefined reference to i2c_write' /home/jenkins/u-boot/Makefile:1497: recipe for target 'u-boot' failed make[1]: *** [u-boot] Error 1
Makefile:148: recipe for target 'sub-make' failed
make: *** [sub-make] Error 2

Quoted 6 lines
Quoted 2 lines

Ehrm, ok, let me check that. Do you have a Travis build with more errors or is this the only one?

This was in my local jenkins setup as that's on a board I have and test. There was a travis run but I force-pushed over it to test my branch again.

OK, so it turns out the current code isn't fully convert cmd/eeprom to DM as the code now still relies on CONFIG_SYS_I2C_EEPROM_BUS being defined.

I'll prepare a patch to make it work without that define. Being like that, it's for the next merge window, of course.

Regards,
Simon