From: "Marek Behún" <marek.behun@nic.cz>
To: Stefan Roese <sr@denx.de>
Cc: u-boot@lists.denx.de, pali@kernel.org,
Chris Packham <judge.packham@gmail.com>,
Baruch Siach <baruch@tkos.co.il>,
Dennis Gilmore <dgilmore@redhat.com>,
Mario Six <mario.six@gdsys.cc>, Jon Nettleton <jon@solid-run.com>
Subject: Re: [PATCH u-boot-marvell 25/29] tools: kwboot: Support higher baudrates when booting via UART
Date: Wed, 25 Aug 2021 18:49:05 +0200 [thread overview]
Message-ID: <20210825184905.16cf1fe5@dellmb> (raw)
In-Reply-To: <20210825134634.3959-26-marek.behun@nic.cz>
On Wed, 25 Aug 2021 15:46:30 +0200
Marek Behún <marek.behun@nic.cz> wrote:
> @@ -765,6 +1187,37 @@ kwboot_img_is_secure(void *img)
> return 0;
> }
>
> +static void *
> +kwboot_img_grow_data_left(void *img, size_t *size, size_t grow)
> +{
> + uint32_t hdrsz, datasz, srcaddr;
> + struct main_hdr_v1 *hdr = img;
> + uint8_t *data;
> +
> + srcaddr = le32_to_cpu(hdr->srcaddr);
> +
> + hdrsz = kwbheader_size(hdr);
> + data = (uint8_t *)img + srcaddr;
> + datasz = *size - srcaddr;
> +
> + /* only move data if there is not enough space */
> + if (hdrsz + grow > srcaddr) {
> + size_t need = hdrsz + grow - srcaddr;
> +
> + /* move data by enough bytes */
> + memmove(data + need, data, datasz);
> + *size += need;
> + srcaddr += need;
> + }
> +
> + srcaddr -= grow;
> + hdr->srcaddr = cpu_to_le32(srcaddr);
> + hdr->destaddr = cpu_to_le32(le32_to_cpu(hdr->destaddr) - grow);
> + hdr->execaddr = cpu_to_le32(le32_to_cpu(hdr->execaddr) - grow);
Sorry, we need to do one more thing here:
hdr->blocksize = cpu_to_le32(le32_to_cpu(hdr->blocksize) + grow);
I will fix this in v2, unless Stefan is willing to fix this himself.
Marek
next prev parent reply other threads:[~2021-08-25 16:49 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-25 13:46 [PATCH u-boot-marvell 00/29] kwboot higher baudrate Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 01/29] tools: kwbimage: Fix printf format warning Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 02/29] tools: kwboot: Fix buffer overflow in kwboot_terminal() Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 03/29] tools: kwboot: Make the quit sequence buffer const Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 04/29] tools: kwboot: Refactor and fix writing buffer Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 05/29] tools: kwboot: Print version information header Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 06/29] tools: kwboot: Fix kwboot_xm_sendblock() function when kwboot_tty_recv() fails Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 07/29] tools: kwboot: Fix return type of kwboot_xm_makeblock() function Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 08/29] tools: kwboot: Fix comparison of integers with different size Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 09/29] tools: kwboot: Fix printing progress Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 10/29] tools: kwboot: Print newline on error when progress was not completed Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 11/29] tools: kwboot: Split sending image into header and data stages Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 12/29] tools: kwboot: Use a function to check whether received byte is a Xmodem reply Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 13/29] tools: kwboot: Allow non-xmodem text output from BootROM only in a specific case Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 14/29] tools: kwboot: Print new line after SPL output Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 15/29] tools: kwboot: Allow greater timeout when executing header code Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 16/29] tools: kwboot: Properly finish xmodem transfer Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 17/29] tools: kwboot: Always call kwboot_img_patch_hdr() Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 19/29] tools: kwboot: Don't patch image header if signed Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 20/29] tools: kwboot: Patch source address in image header Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 21/29] tools: kwboot: Patch destination address to DDR area for SPI image Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 22/29] tools: kwbimage: Refactor image_version() Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 23/29] tools: kwbimage: Refactor kwbimage header size determination Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 24/29] tools: kwboot: Round up header size to 128 B when patching Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 25/29] tools: kwboot: Support higher baudrates when booting via UART Marek Behún
2021-08-25 16:49 ` Marek Behún [this message]
2021-08-26 13:13 ` Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 26/29] tools: kwboot: Allow any baudrate on Linux Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 27/29] tools: kwboot: Add Pali and Marek as authors Marek Behún
2021-08-25 13:46 ` [PATCH u-boot-marvell 28/29] doc/kwboot.1: Update man page Marek Behún
2021-08-27 1:37 ` Chris Packham
2021-08-27 8:13 ` Pavol Rohár
2021-08-27 8:36 ` Pali Rohár
2021-08-27 13:35 ` Marek Behún
2021-08-27 13:39 ` Pali Rohár
2021-08-25 13:46 ` [PATCH u-boot-marvell 29/29] MAINTAINERS: Add entry for kwbimage / kwboot tools Marek Behún
2021-08-25 17:01 ` [PATCH u-boot-marvell 18/29] tools: kwbimage: Simplify iteration over version 1 optional headers Marek Behún
2021-08-27 1:16 ` [PATCH u-boot-marvell 00/29] kwboot higher baudrate Chris Packham
2021-08-27 1:32 ` Chris Packham
2021-08-27 1:39 ` Marek Behún
2021-08-27 2:45 ` Chris Packham
2021-08-27 8:32 ` Pali Rohár
2021-08-27 10:59 ` Chris Packham
2021-08-27 12:31 ` Marek Behún
2021-08-27 22:09 ` Chris Packham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210825184905.16cf1fe5@dellmb \
--to=marek.behun@nic.cz \
--cc=baruch@tkos.co.il \
--cc=dgilmore@redhat.com \
--cc=jon@solid-run.com \
--cc=judge.packham@gmail.com \
--cc=mario.six@gdsys.cc \
--cc=pali@kernel.org \
--cc=sr@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox