From: Icenowy Zheng <icenowy@aosc.io>
To: Simon Glass <sjg@chromium.org>,
Andre Przywara <andre.przywara@arm.com>,
Jagan Teki <jagan@amarulasolutions.com>,
Samuel Holland <samuel@sholland.org>
Cc: u-boot@lists.denx.de, linux-sunxi@lists.linux.dev,
Icenowy Zheng <icenowy@aosc.io>
Subject: [RFC PATCH 3/4] mkimage: sunxi_egon: add support for riscv
Date: Fri, 18 Jun 2021 02:47:50 +0800 [thread overview]
Message-ID: <20210617184751.4083469-2-icenowy@aosc.io> (raw)
In-Reply-To: <20210617184621.4083311-1-icenowy@aosc.io>
There's now a sun20i family in sunxi, which uses RISC-V CPU.
Add support for making eGON.BT0 image for RISC-V.
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
tools/sunxi_egon.c | 35 +++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/tools/sunxi_egon.c b/tools/sunxi_egon.c
index af649c392e..0fff25843f 100644
--- a/tools/sunxi_egon.c
+++ b/tools/sunxi_egon.c
@@ -19,7 +19,7 @@ static int egon_check_params(struct image_tool_params *params)
int arch;
/* Assume ARM when no architecture specified for compatibility */
- if (params->Aflags)
+ if (params->Aflag)
arch = params->arch;
else
arch = IH_ARCH_ARM;
@@ -27,8 +27,9 @@ static int egon_check_params(struct image_tool_params *params)
/*
* Check whether the architecture is supported.
*/
- switch(params->arch) {
+ switch(arch) {
case IH_ARCH_ARM:
+ case IH_ARCH_RISCV:
break;
default:
return EXIT_FAILURE;
@@ -46,7 +47,7 @@ static int egon_verify_header(unsigned char *ptr, int image_size,
int arch;
/* Assume ARM when no architecture specified for compatibility */
- if (params->Aflags)
+ if (params->Aflag)
arch = params->arch;
else
arch = IH_ARCH_ARM;
@@ -55,11 +56,15 @@ static int egon_verify_header(unsigned char *ptr, int image_size,
* First 4 bytes must be a branch instruction of the corresponding
* architecture.
*/
- switch(params->arch) {
+ switch(arch) {
case IH_ARCH_ARM:
if ((le32_to_cpu(header->b_instruction) & 0xff000000) != 0xea000000)
return EXIT_FAILURE;
break;
+ case IH_ARCH_RISCV:
+ if ((le32_to_cpu(header->b_instruction) & 0x00000fff) != 0x0000006f)
+ return EXIT_FAILURE;
+ break;
default:
return EXIT_FAILURE; /* Unknown architecture */
}
@@ -113,7 +118,7 @@ static void egon_set_header(void *buf, struct stat *sbuf, int infd,
int arch;
/* Assume ARM when no architecture specified for compatibility */
- if (params->Aflags)
+ if (params->Aflag)
arch = params->arch;
else
arch = IH_ARCH_ARM;
@@ -122,12 +127,30 @@ static void egon_set_header(void *buf, struct stat *sbuf, int infd,
* Different architectures need different first instruction to
* branch to the body.
*/
- switch (params->arch) {
+ switch (arch) {
case IH_ARCH_ARM:
/* Generate an ARM branch instruction to jump over the header. */
value = 0xea000000 | (sizeof(struct boot_file_head) / 4 - 2);
header->b_instruction = cpu_to_le32(value);
break;
+ case IH_ARCH_RISCV:
+ /*
+ * Generate a RISC-V JAL instruction with rd=x0
+ * (pseudo instruction J, jump without side effects).
+ *
+ * The following weird bit operation maps imm[20]
+ * to inst[31], imm[10:1] to inst[30:21],
+ * imm[11] to inst[20], imm[19:12] to inst[19:12],
+ * and imm[0] is dropped (because 1-byte RISC-V instruction
+ * is not allowed).
+ */
+ value = 0x0000006f |
+ ((sizeof(struct boot_file_head) & 0x00100000) << 11) |
+ ((sizeof(struct boot_file_head) & 0x000007fe) << 20) |
+ ((sizeof(struct boot_file_head) & 0x00000800) << 9) |
+ ((sizeof(struct boot_file_head) & 0x000ff000) << 0);
+ header->b_instruction = cpu_to_le32(value);
+ break;
}
memcpy(header->magic, BOOT0_MAGIC, sizeof(header->magic));
--
2.30.2
next prev parent reply other threads:[~2021-06-17 18:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 18:46 [RFC PATCH 0/4] mkimage: sunxi_egon: add riscv support Icenowy Zheng
2021-06-17 18:46 ` [RFC PATCH 1/4] mkimage: add a flag to describe whether -A is specified Icenowy Zheng
2021-06-18 16:38 ` Tom Rini
2021-06-26 18:31 ` Simon Glass
2021-06-17 18:47 ` [RFC PATCH 2/4] mkimage: sunxi_egon: refactor for multi-architecture support Icenowy Zheng
2021-06-18 16:38 ` Tom Rini
2021-06-17 18:47 ` Icenowy Zheng [this message]
2021-06-17 18:48 ` [RFC PATCH 4/4] sunxi: specify architecture when generating SPL boot image Icenowy Zheng
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=20210617184751.4083469-2-icenowy@aosc.io \
--to=icenowy@aosc.io \
--cc=andre.przywara@arm.com \
--cc=jagan@amarulasolutions.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=samuel@sholland.org \
--cc=sjg@chromium.org \
--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;
as well as URLs for NNTP newsgroup(s).