From: Chester Lin <clin@suse.com>
To: "paul.walmsley@sifive.com" <paul.walmsley@sifive.com>,
"palmer@sifive.com" <palmer@sifive.com>,
"aou@eecs.berkeley.edu" <aou@eecs.berkeley.edu>,
"merker@debian.org" <merker@debian.org>,
"atish.patra@wdc.com" <atish.patra@wdc.com>,
"Anup.Patel@wdc.com" <Anup.Patel@wdc.com>,
"tglx@linutronix.de" <tglx@linutronix.de>
Cc: Chester Lin <clin@suse.com>,
"marek.vasut@gmail.com" <marek.vasut@gmail.com>,
"linux-riscv@lists.infradead.org"
<linux-riscv@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"rick@andestech.com" <rick@andestech.com>
Subject: [PATCH] riscv: save space on the magic number field of image header
Date: Fri, 6 Sep 2019 07:17:15 +0000 [thread overview]
Message-ID: <20190906071631.23695-1-clin@suse.com> (raw)
Change the symbol from "RISCV" to "RSCV" so the magic number can be 32-bit
long, which is consistent with other architectures.
Signed-off-by: Chester Lin <clin@suse.com>
---
arch/riscv/include/asm/image.h | 9 +++++----
arch/riscv/kernel/head.S | 5 ++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/riscv/include/asm/image.h b/arch/riscv/include/asm/image.h
index ef28e106f247..ec8bbfe86dde 100644
--- a/arch/riscv/include/asm/image.h
+++ b/arch/riscv/include/asm/image.h
@@ -3,7 +3,8 @@
#ifndef __ASM_IMAGE_H
#define __ASM_IMAGE_H
-#define RISCV_IMAGE_MAGIC "RISCV"
+#define RISCV_IMAGE_MAGIC "RSCV"
+
#define RISCV_IMAGE_FLAG_BE_SHIFT 0
#define RISCV_IMAGE_FLAG_BE_MASK 0x1
@@ -39,9 +40,9 @@
* @version: version
* @res1: reserved
* @res2: reserved
- * @magic: Magic number
* @res3: reserved (will be used for additional RISC-V specific
* header)
+ * @magic: Magic number
* @res4: reserved (will be used for PE COFF offset)
*
* The intention is for this header format to be shared between multiple
@@ -57,8 +58,8 @@ struct riscv_image_header {
u32 version;
u32 res1;
u64 res2;
- u64 magic;
- u32 res3;
+ u64 res3;
+ u32 magic;
u32 res4;
};
#endif /* __ASSEMBLY__ */
diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S
index 0f1ba17e476f..1f8fffbecf68 100644
--- a/arch/riscv/kernel/head.S
+++ b/arch/riscv/kernel/head.S
@@ -39,9 +39,8 @@ ENTRY(_start)
.word RISCV_HEADER_VERSION
.word 0
.dword 0
- .asciz RISCV_IMAGE_MAGIC
- .word 0
- .balign 4
+ .dword 0
+ .ascii RISCV_IMAGE_MAGIC
.word 0
.global _start_kernel
--
2.22.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next reply other threads:[~2019-09-06 7:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 7:17 Chester Lin [this message]
2019-09-06 8:20 ` [PATCH] riscv: save space on the magic number field of image header Anup Patel
2019-09-06 9:12 ` Chester Lin
2019-09-06 10:19 ` Anup Patel
2019-09-13 19:04 ` Palmer Dabbelt
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=20190906071631.23695-1-clin@suse.com \
--to=clin@suse.com \
--cc=Anup.Patel@wdc.com \
--cc=aou@eecs.berkeley.edu \
--cc=atish.patra@wdc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=merker@debian.org \
--cc=palmer@sifive.com \
--cc=paul.walmsley@sifive.com \
--cc=rick@andestech.com \
--cc=tglx@linutronix.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).