| Message ID | 20190314205743.30299-1-simon.k.r.goldschmidt@gmail.com |
|---|---|
| State | Rejected |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] Revert "cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT" | expand |
On 14. 03. 19 21:57, Simon Goldschmidt wrote:
> This reverts commit 65a97e7fcf54feb7c4ebe1aee8a572830af4cf51.
You should also put subject of that patch here. It is much easier to
check what was that.
M
On Fri, Mar 15, 2019 at 7:44 AM Michal Simek <michal.simek@xilinx.com> wrote: > > On 14. 03. 19 21:57, Simon Goldschmidt wrote: > > 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
On 15. 03. 19 7:51, Simon Goldschmidt wrote: > On Fri, Mar 15, 2019 at 7:44 AM Michal Simek <michal.simek@xilinx.com> wrote: >> >> On 14. 03. 19 21:57, Simon Goldschmidt wrote: >>> 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
Tom, (adding Lukasz as he authored the DM fix 0c07a9b4078d) Am 14.03.2019 um 21:57 schrieb 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") > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> 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 > --- > > cmd/Kconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index 4bcc5c4557..74c5a1a6ed 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -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 >
On Fri, 15 Mar 2019 20:02:25 +0100 Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> wrote: > Tom, > > (adding Lukasz as he authored the DM fix 0c07a9b4078d) > > Am 14.03.2019 um 21:57 schrieb 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") > > > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > 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. > > Thanks, > Simon > > > --- > > > > cmd/Kconfig | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/cmd/Kconfig b/cmd/Kconfig > > index 4bcc5c4557..74c5a1a6ed 100644 > > --- a/cmd/Kconfig > > +++ b/cmd/Kconfig > > @@ -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 > 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@denx.de
Hi Lukasz, Am 18.03.2019 um 08:23 schrieb Lukasz Majewski: > On Fri, 15 Mar 2019 20:02:25 +0100 > Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> wrote: > >> Tom, >> >> (adding Lukasz as he authored the DM fix 0c07a9b4078d) >> >> Am 14.03.2019 um 21:57 schrieb 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") >>> >>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> >> >> 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. 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 > >> >> Thanks, >> Simon >> >>> --- >>> >>> cmd/Kconfig | 1 - >>> 1 file changed, 1 deletion(-) >>> >>> diff --git a/cmd/Kconfig b/cmd/Kconfig >>> index 4bcc5c4557..74c5a1a6ed 100644 >>> --- a/cmd/Kconfig >>> +++ b/cmd/Kconfig >>> @@ -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 >> > > > > > 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@denx.de >
Tom, Am 21.03.2019 um 20:21 schrieb Simon Goldschmidt: > Hi Lukasz, > > Am 18.03.2019 um 08:23 schrieb Lukasz Majewski: >> On Fri, 15 Mar 2019 20:02:25 +0100 >> Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> wrote: >> >>> Tom, >>> >>> (adding Lukasz as he authored the DM fix 0c07a9b4078d) >>> >>> Am 14.03.2019 um 21:57 schrieb 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") >>>> >>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> >>> >>> 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. > > 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 > > Regards, > Simon > >> >>> >>> Thanks, >>> Simon >>> >>>> --- >>>> >>>> cmd/Kconfig | 1 - >>>> 1 file changed, 1 deletion(-) >>>> >>>> diff --git a/cmd/Kconfig b/cmd/Kconfig >>>> index 4bcc5c4557..74c5a1a6ed 100644 >>>> --- a/cmd/Kconfig >>>> +++ b/cmd/Kconfig >>>> @@ -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 >>> >> >> >> >> >> 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@denx.de >> >
On Thu, Mar 14, 2019 at 09:57:42PM +0100, Simon Goldschmidt wrote: > 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") > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > --- > > 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
Tom Rini <trini@konsulko.com> schrieb am Mo., 25. März 2019, 16:43: > On Thu, Mar 14, 2019 at 09:57:42PM +0100, Simon Goldschmidt wrote: > > > 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") > > > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > --- > > > > 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 > Ehrm, ok, let me check that. Do you have a Travis build with more errors or is this the only one? Regards, Simon
On Mon, Mar 25, 2019 at 05:42:13PM +0100, Simon Goldschmidt wrote: > Tom Rini <trini@konsulko.com> schrieb am Mo., 25. März 2019, 16:43: > > > On Thu, Mar 14, 2019 at 09:57:42PM +0100, Simon Goldschmidt wrote: > > > > > 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") > > > > > > Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> > > > --- > > > > > > 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 > > > > 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.
On 25.03.19 18:17, Tom Rini wrote: > On Mon, Mar 25, 2019 at 05:42:13PM +0100, Simon Goldschmidt wrote: >> Tom Rini <trini@konsulko.com> schrieb am Mo., 25. März 2019, 16:43: >> >>> On Thu, Mar 14, 2019 at 09:57:42PM +0100, Simon Goldschmidt wrote: >>> >>>> 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") >>>> >>>> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> >>>> --- >>>> >>>> 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 >>> >> >> 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
diff --git a/cmd/Kconfig b/cmd/Kconfig index 4bcc5c4557..74c5a1a6ed 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -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
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") Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> --- cmd/Kconfig | 1 - 1 file changed, 1 deletion(-)