[PATCH 8/9] doc: add board documentation for stm32mp1
Patrick DELAUNAY
patrick.delaunay at st.com
Mon Feb 10 12:02:22 CET 2020
Hi Heinrich
> From: Heinrich Schuchardt <xypron.glpk at gmx.de>
> Sent: mardi 28 janvier 2020 12:34
>
> On 1/28/20 10:11 AM, Patrick Delaunay wrote:
> > Change plain test README to rst format and move this file in
> > documentation directory.
> >
> > Signed-off-by: Patrick Delaunay <patrick.delaunay at st.com>
>
> When I apply only this patch to origin/master:
>
> git am /tmp/1.patch
> Applying: doc: add board documentation for stm32mp1
> error: patch failed: board/st/stm32mp1/README:1
> error: board/st/stm32mp1/README: patch does not apply
> .git/rebase-apply/patch:1164: new blank line at EOF.
>
> Maybe this patch will have to be rebased.
I think the issue is because ethe readme is updated in the previous patch
[7/9] board: stm32mp1: update readme
=> I think I will get the board patch in my next pull request on stm32 and
then rebase this patch only.
> > ---
> >
> > board/st/stm32mp1/README | 520 +--------------------------------
> > doc/board/index.rst | 1 +
> > doc/board/st/index.rst | 9 +
> > doc/board/st/stm32mp1.rst | 598
> ++++++++++++++++++++++++++++++++++++++
> > 4 files changed, 609 insertions(+), 519 deletions(-)
> > create mode 100644 doc/board/st/index.rst
> > create mode 100644 doc/board/st/stm32mp1.rst
> >
> > diff --git a/board/st/stm32mp1/README b/board/st/stm32mp1/README index
> > 5d7465a8c8..8172d26a66 100644
> > --- a/board/st/stm32mp1/README
> > +++ b/board/st/stm32mp1/README
> > @@ -1,519 +1 @@
> > -SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -# -# Copyright (C)
> > 2018 STMicroelectronics - All Rights Reserved -#
> > -
> > -U-Boot on STMicroelectronics STM32MP15x
> > -=======================================
......
> > + bi
> > +
> > +- you can also dump the OTP and the PMIC NVM with::
> > +
> > + $> dfu-util -d 0483:5720 -a 25 -U otp.bin $> dfu-util -d 0483:5720
> > + -a 26 -U pmic.bin
> > +
>
> This blank line could be removed.
Ok => in V2 with rebase
>
> 'make html' shows that the reStructured text files are syntactically valid.
>
> Tested-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
Thanks
Patrkc
More information about the U-Boot
mailing list