Hi,

The second version of the patchset brings the corrections
requested in the review. Details can be found in the changelog
below.

The patches are available in the github:
https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/misc-upstream-r20171201-2

I'm looking forward to your comments or remarks.

Best regards,
Marcin

Changelog:
v1 - > v2

* 1/4
    - Add tftp as a build-time selectable option
    - Update commit message

* 2/4
    - Add RB

* 3/4
    - Leave initial file format and reword commit message

* 4/4
    - Leave PHY_AUTONEGOTIATE_TIMEOUT unmodified and
      remove double definition of the timeout.

Marcin Wojtas (4):
  Marvell/Armada: Switch to dynamic tftp command
  Marvell/Armada: Fix watchdog control base
  Marvell/Applications: FirmwareUpdate: Fix usage information
  Marvell/Drivers: MvPhyDxe: Cleanup the header

 Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 5190 bytes
 Platform/Marvell/Armada/Armada.dsc.inc                   |   6 +-
 Platform/Marvell/Armada/Armada70x0.dsc                   |   1 +
 Platform/Marvell/Armada/Armada70x0.fdf                   |   3 +
 Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c     |   2 +-
 Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h     | 152 ++++----------------
 6 files changed, 40 insertions(+), 124 deletions(-)

-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

fupdate command's usage information referred to a deprecated
'-f' flag in 'examples' section. It was a residue from the
initial version of the application, removed during review
before merging to upstream branch. Correct the help information.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 5190 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
index 9d52e590c6d239621d226a240a3f9755210f52fe..146f624737d96e2cd354857dbb63390ebe2f347e 100644
GIT binary patch
delta 56
zcmbQGaZF=_h>&<DLmq<yLoh=CgC~$qW5{7hWGH6Hm@FuixVb_of^o76yTD`vb`~(c
HAnXMIdh-p2

delta 28
kcmX@6F-v2Eh|pv`p*Ut;hP27{LYA8k2`Mp7{v+%K0D@Hs0RR91

-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

On Fri, Dec 01, 2017 at 04:35:06PM +0100, Marcin Wojtas wrote:
> fupdate command's usage information referred to a deprecated
> '-f' flag in 'examples' section. It was a residue from the
> initial version of the application, removed during review
> before merging to upstream branch. Correct the help information.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

I boggled slightly at how the file with deleted content is larger than
the original, so went to have a look, and what I see is:

--- pre.txt     2017-12-04 13:43:32.985446108 +0000
+++ post.txt    2017-12-04 13:44:30.433120594 +0000
@@ -50,10 +50,10 @@
 ".SH EXAMPLES\r\n"
 " \r\n"
 "EXAMPLES:\r\n"
-"Update firmware from file fs2:flash-image.bin\r\n"
-"  fupdate -f fs2:flash-image.bin\r\n"
+"Update firmware in SPI flash from file fs2:flash-image.bin\r\n"
+"  fupdate fs2:flash-image.bin\r\n"
 ".SH RETURNVALUES\r\n"
 " \r\n"
 "RETURN VALUES:\r\n"
 "  SHELL_SUCCESS             The action was completed as requested.\r\n"
-"  SHELL_ABORTED Error while processing command\r\n"
+"  SHELL_ABORTED             Error while processing command\r\n"


Now, I don't mind random format cleanup as much in .uni files as
elsewhere, since we don't get sane diffs anyway. But that also makes
detailed and accurate commit messages much more important.

So please, add something about the rewording and the whitespace fixes.

/
    Leif

> ---
>  Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni | Bin 5146 -> 5190 bytes
>  1 file changed, 0 insertions(+), 0 deletions(-)
> 
> diff --git a/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni b/Platform/Marvell/Applications/FirmwareUpdate/FUpdate.uni
> index 9d52e590c6d239621d226a240a3f9755210f52fe..146f624737d96e2cd354857dbb63390ebe2f347e 100644
> GIT binary patch
> delta 56
> zcmbQGaZF=_h>&<DLmq<yLoh=CgC~$qW5{7hWGH6Hm@FuixVb_of^o76yTD`vb`~(c
> HAnXMIdh-p2
> 
> delta 28
> kcmX@6F-v2Eh|pv`p*Ut;hP27{LYA8k2`Mp7{v+%K0D@Hs0RR91
> 
> -- 
> 2.7.4
> 
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

2017-12-04 14:52 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> On Fri, Dec 01, 2017 at 04:35:06PM +0100, Marcin Wojtas wrote:
>> fupdate command's usage information referred to a deprecated
>> '-f' flag in 'examples' section. It was a residue from the
>> initial version of the application, removed during review
>> before merging to upstream branch. Correct the help information.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>
> I boggled slightly at how the file with deleted content is larger than
> the original, so went to have a look, and what I see is:
>
> --- pre.txt     2017-12-04 13:43:32.985446108 +0000
> +++ post.txt    2017-12-04 13:44:30.433120594 +0000
> @@ -50,10 +50,10 @@
>  ".SH EXAMPLES\r\n"
>  " \r\n"
>  "EXAMPLES:\r\n"
> -"Update firmware from file fs2:flash-image.bin\r\n"
> -"  fupdate -f fs2:flash-image.bin\r\n"
> +"Update firmware in SPI flash from file fs2:flash-image.bin\r\n"
> +"  fupdate fs2:flash-image.bin\r\n"
>  ".SH RETURNVALUES\r\n"
>  " \r\n"
>  "RETURN VALUES:\r\n"
>  "  SHELL_SUCCESS             The action was completed as requested.\r\n"
> -"  SHELL_ABORTED Error while processing command\r\n"
> +"  SHELL_ABORTED             Error while processing command\r\n"
>
>
> Now, I don't mind random format cleanup as much in .uni files as
> elsewhere, since we don't get sane diffs anyway. But that also makes
> detailed and accurate commit messages much more important.
>
> So please, add something about the rewording and the whitespace fixes.
>

Sure, will do.

Thanks,
Marcin
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel