On Thu, Aug 15, 2024 at 09:34:38PM +0100, Simon Glass wrote:
> Hi Tom,
>
> On Thu, 15 Aug 2024 at 18:01, Tom Rini <tr...@konsulko.com> wrote:
> >
> > On Sat, Aug 10, 2024 at 02:51:50PM -0600, Simon Glass wrote:
> >
> > > Several mmc subcommand print a blank line before starting and after
> > > finishing. It isn't necessary to do both, so drop the first one.
> > >
> > > It is questionable whether these command should produce any output at
> > > all, but leave it for now.
> > >
> > > Signed-off-by: Simon Glass <s...@chromium.org>
> > > ---
> > >
> > > cmd/mmc.c | 12 ++++++------
> > > 1 file changed, 6 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/cmd/mmc.c b/cmd/mmc.c
> > > index 7244a90f4dc..ff7b8e555ba 100644
> > > --- a/cmd/mmc.c
> > > +++ b/cmd/mmc.c
> > > @@ -238,7 +238,7 @@ static int do_mmcrpmb_read(struct cmd_tbl *cmdtp, int
> > > flag,
> > > if (argc == 5)
> > > key_addr = (void *)hextoul(argv[4], NULL);
> > >
> > > - printf("\nMMC RPMB read: dev # %d, block # %d, count %d ... ",
> > > + printf("MMC RPMB read: dev # %d, block # %d, count %d ... ",
> > > curr_device, blk, cnt);
> > > n = mmc_rpmb_read(mmc, addr, blk, cnt, key_addr);
> > >
> > > @@ -265,7 +265,7 @@ static int do_mmcrpmb_write(struct cmd_tbl *cmdtp,
> > > int flag,
> > > cnt = hextoul(argv[3], NULL);
> > > key_addr = (void *)hextoul(argv[4], NULL);
> > >
> > > - printf("\nMMC RPMB write: dev # %d, block # %d, count %d ... ",
> > > + printf("MMC RPMB write: dev # %d, block # %d, count %d ... ",
> > > curr_device, blk, cnt);
> > > n = mmc_rpmb_write(mmc, addr, blk, cnt, key_addr);
> > >
> > > @@ -362,7 +362,7 @@ static int do_mmc_read(struct cmd_tbl *cmdtp, int
> > > flag,
> > > if (!mmc)
> > > return CMD_RET_FAILURE;
> > >
> > > - printf("\nMMC read: dev # %d, block # %d, count %d ... ",
> > > + printf("MMC read: dev # %d, block # %d, count %d ... ",
> > > curr_device, blk, cnt);
> > >
> > > n = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, addr);
> > > @@ -411,7 +411,7 @@ static int do_mmc_sparse_write(struct cmd_tbl *cmdtp,
> > > int flag,
> > > if (!mmc)
> > > return CMD_RET_FAILURE;
> > >
> > > - printf("\nMMC Sparse write: dev # %d, block # %d ... ",
> > > + printf("MMC Sparse write: dev # %d, block # %d ... ",
> > > curr_device, blk);
> > >
> > > if (mmc_getwp(mmc) == 1) {
> > > @@ -455,7 +455,7 @@ static int do_mmc_write(struct cmd_tbl *cmdtp, int
> > > flag,
> > > if (!mmc)
> > > return CMD_RET_FAILURE;
> > >
> > > - printf("\nMMC write: dev # %d, block # %d, count %d ... ",
> > > + printf("MMC write: dev # %d, block # %d, count %d ... ",
> > > curr_device, blk, cnt);
> > >
> > > if (mmc_getwp(mmc) == 1) {
> > > @@ -484,7 +484,7 @@ static int do_mmc_erase(struct cmd_tbl *cmdtp, int
> > > flag,
> > > if (!mmc)
> > > return CMD_RET_FAILURE;
> > >
> > > - printf("\nMMC erase: dev # %d, block # %d, count %d ... ",
> > > + printf("MMC erase: dev # %d, block # %d, count %d ... ",
> > > curr_device, blk, cnt);
> > >
> > > if (mmc_getwp(mmc) == 1) {
> >
> > Did you confirm things look right still, on hardware?
>
> Yes that's why I decided to drop it. See here for example:
>
> $ ub-int ff3399
> Building U-Boot in sourcedir for firefly-rk3399
> Bootstrapping U-Boot from dir /tmp/b/firefly-rk3399
> Writing U-Boot using method rockchip
>
> U-Boot TPL 2024.10-rc2-00093-gcbaae70baf39 (Aug 15 2024 - 13:27:51)
> Channel 0: DDR3, 800MHz
> BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB
> Channel 1: DDR3, 800MHz
> BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB
> 256B stride
> Trying to boot from BOOTROM
> Returning to boot ROM...
>
> U-Boot SPL 2024.10-rc2-00093-gcbaae70baf39 (Aug 15 2024 - 13:27:51 -0600)
> Trying to boot from MMC2
> ## Checking hash(es) for config config-1 ... OK
> ## Checking hash(es) for Image atf-1 ... sha256+ OK
> ## Checking hash(es) for Image u-boot ... sha256+ OK
> ## Checking hash(es) for Image fdt-1 ... sha256+ OK
> ## Checking hash(es) for Image atf-2 ... sha256+ OK
> ## Checking hash(es) for Image atf-3 ... sha256+ OK
> ## Checking hash(es) for Image atf-4 ... sha256+ OK
> load_simple_fit: Skip load 'atf-5': image size is 0!
>
>
> U-Boot 2024.10-rc2-00093-gcbaae70baf39 (Aug 15 2024 - 13:27:51 -0600)
>
> SoC: Rockchip rk3399
> Reset cause: POR
> Model: Firefly-RK3399 Board
> DRAM: 4 GiB (effective 3.9 GiB)
> PMIC: RK808
> Core: 308 devices, 29 uclasses, devicetree: separate
> MMC: mmc@fe310000: 3, mmc@fe320000: 1, mmc@fe330000: 0
> Loading Environment from MMC... Reading from MMC(1)... *** Warning -
> bad CRC, using default environment
>
> In: serial@ff1a0000
> Out: serial@ff1a0000
> Err: serial@ff1a0000
> Model: Firefly-RK3399 Board
> Net: eth0: ethernet@fe300000
> Hit any key to stop autoboot: 0
> => mmc read 1000 0 100
>
> MMC read: dev # 0, block # 0, count 256 ... 256 blocks read: OK
> =>
>
> With this patch, the blank line above is gone.Ah thanks. > BTW, this whole series is marked as needing changes. I've dropped the > wget patches. Should I send it again, or just wait? Yeah, wait a bit for other feedback, esp from the corstone-1000 people, and repost. -- Tom
signature.asc
Description: PGP signature
