All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH u-boot-marvell 21/29] tools: kwboot: Patch destination address to DDR area for SPI image
Date: Wed, 25 Aug 2021 15:46:26 +0200	[thread overview]
Message-ID: <20210825134634.3959-22-marek.behun@nic.cz> (raw)
In-Reply-To: <20210825134634.3959-1-marek.behun@nic.cz>

From: Pali Rohár <pali@kernel.org>

SPI/NOR kwbimage may have destination address set to 0xFFFFFFFF, which
means that the image is not downloaded to DDR but rather it is executed
directly from SPI/NOR. In this case execution address is set to SPI/NOR
area.

When patching image to UART type, change destination and execution
addresses from SPI/NOR XIP area to DDR area 0x00800000 (which is default
for A38x).

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 tools/kwboot.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 9cc7936959..7c6ea2f75d 100644
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -836,6 +836,13 @@ kwboot_img_patch_hdr(void *img, size_t size)
 		if (hdr->srcaddr == 0xFFFFFFFF)
 			hdr->srcaddr = cpu_to_le32(hdrsz);
 		break;
+
+	case IBR_HDR_SPI_ID:
+		if (hdr->destaddr == 0xFFFFFFFF) {
+			kwboot_printv("Patching destination and execution addresses from SPI/NOR XIP area to DDR area 0x00800000\n");
+			hdr->destaddr = cpu_to_le32(0x00800000);
+			hdr->execaddr = cpu_to_le32(0x00800000);
+		}
 	}
 
 	hdr->blockid = IBR_HDR_UART_ID;
-- 
2.31.1


  parent reply	other threads:[~2021-08-25 13:51 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 ` Marek Behún [this message]
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
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=20210825134634.3959-22-marek.behun@nic.cz \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.