From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: jmaselbas@kalray.eu, Ahmad Fatoum <a.fatoum@pengutronix.de>,
rcz@pengutronix.de
Subject: [PATCH RESEND v4 04/13] MIPS: qemu-malta: generate swapped image as part of multi-image build
Date: Fri, 4 Jun 2021 10:46:55 +0200 [thread overview]
Message-ID: <20210604084704.17410-5-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20210604084704.17410-1-a.fatoum@pengutronix.de>
Having to manually swap the words in the MIPS Malta image for QEMU
little endian emulation is annoying.
Have the multi-image build for Malta generate a second .swapped
image that can be readily used if needed.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Documentation/boards/mips/qemu-malta.rst | 16 ++++------------
images/.gitignore | 1 +
images/Makefile | 2 +-
images/Makefile.malta | 10 +++++++++-
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Documentation/boards/mips/qemu-malta.rst b/Documentation/boards/mips/qemu-malta.rst
index e188ae8c642a..fd37d5edb229 100644
--- a/Documentation/boards/mips/qemu-malta.rst
+++ b/Documentation/boards/mips/qemu-malta.rst
@@ -10,31 +10,23 @@ QEMU run string:
qemu-system-mips -nodefaults -M malta -m 256 \
-device VGA -serial stdio -monitor null \
- -bios barebox-flash-image
+ -bios ./images/barebox-qemu-malta.img
Little-endian mode
------------------
-Running little-endian Malta is a bit tricky.
In little-endian mode the 32bit words in the boot flash image are swapped,
a neat trick which allows bi-endian firmware.
-You have to swap words of ``zbarebox.bin`` image, e.g.:
-
-.. code-block:: sh
-
- echo arch/mips/pbl/zbarebox.bin \
- | cpio --create \
- | cpio --extract --swap --unconditional
-
-QEMU run string:
+The barebox build generates a second ``./images/barebox-qemu-malta.img.swapped``
+image that can be used in this case, e.g.:
.. code-block:: sh
qemu-system-mipsel -nodefaults -M malta -m 256 \
-device VGA -serial stdio -monitor null \
- -bios barebox-flash-image
+ -bios ./images/barebox-qemu-malta.img.swapped
Using GXemul
diff --git a/images/.gitignore b/images/.gitignore
index eafdb44b5bdd..3a9a77dad16e 100644
--- a/images/.gitignore
+++ b/images/.gitignore
@@ -32,3 +32,4 @@ barebox.sum
*.mvebu1img
*.stm32
*.nmon
+*.swapped
diff --git a/images/Makefile b/images/Makefile
index c185982c17ed..cc330d957597 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -218,5 +218,5 @@ $(flash-list): $(image-y-path)
clean-files := *.pbl *.pblb *.map start_*.imximg *.img barebox.z start_*.kwbimg \
start_*.kwbuartimg *.socfpgaimg *.mlo *.t20img *.t20img.cfg *.t30img \
*.t30img.cfg *.t124img *.t124img.cfg *.mlospi *.mlo *.mxsbs *.mxssd \
- start_*.simximg start_*.usimximg *.zynqimg *.image
+ start_*.simximg start_*.usimximg *.zynqimg *.image *.swapped
clean-files += pbl.lds
diff --git a/images/Makefile.malta b/images/Makefile.malta
index 5739ec464092..96d7b86b1187 100644
--- a/images/Makefile.malta
+++ b/images/Makefile.malta
@@ -1,3 +1,11 @@
+quiet_cmd_bswap32_image = BSWAP4 $@
+ cmd_bswap32_image = cp $< $@ && \
+ truncate -s %4 $@ && \
+ objcopy -I binary --reverse-byte=4 $@
+
+$(obj)/%.img.swapped: $(obj)/%.img FORCE
+ $(call if_changed,bswap32_image)
+
pblb-$(CONFIG_BOARD_QEMU_MALTA) += start_qemu_malta
FILE_barebox-qemu-malta.img = start_qemu_malta.pblb
-image-$(CONFIG_BOARD_QEMU_MALTA) += barebox-qemu-malta.img
+image-$(CONFIG_BOARD_QEMU_MALTA) += barebox-qemu-malta.img barebox-qemu-malta.img.swapped
--
2.29.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-06-04 8:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 8:46 [PATCH RESEND v4 00/13] add barebox in-tree testing infrastructure Ahmad Fatoum
2021-06-04 8:46 ` [PATCH RESEND v4 01/13] kbuild: add install target Ahmad Fatoum
2021-06-04 8:46 ` [PATCH RESEND v4 02/13] kbuild: add ARCH={i386, x86_64} as aliases for x86 Ahmad Fatoum
2021-06-04 8:46 ` [PATCH RESEND v4 03/13] kbuild: add ARCH=um alias for sandbox Ahmad Fatoum
2021-06-04 8:46 ` Ahmad Fatoum [this message]
2021-06-04 8:46 ` [PATCH RESEND v4 05/13] openrisc: set default KBUILD_IMAGE Ahmad Fatoum
2021-06-04 8:46 ` [PATCH RESEND v4 06/13] Documentation: boards: RISC-V: update TinyEMU support Ahmad Fatoum
2021-06-04 8:46 ` [PATCH RESEND v4 07/13] test: add basic barebox self-test infrastructure Ahmad Fatoum
2021-06-04 8:46 ` [PATCH RESEND v4 08/13] test: self: port Linux printf kselftest Ahmad Fatoum
2021-06-04 8:47 ` [PATCH RESEND v4 09/13] test: add labgrid-style configs for some emulated targets Ahmad Fatoum
2021-06-04 8:47 ` [PATCH RESEND v4 10/13] test: add first sample tests Ahmad Fatoum
2021-06-04 8:47 ` [PATCH RESEND v4 11/13] test: add emulate.pl, a runner for barebox on emulated targets Ahmad Fatoum
2021-06-04 8:47 ` [PATCH RESEND v4 12/13] test: self: run selftests as part of the pytest suite Ahmad Fatoum
2021-06-04 8:47 ` [PATCH RESEND v4 13/13] test: add bthread test Ahmad Fatoum
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=20210604084704.17410-5-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jmaselbas@kalray.eu \
--cc=rcz@pengutronix.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