Re: [U-Boot] [PATCH] RISCV: image: Add booti support.
On 4/23/19 5:16 PM, Marek Vasut wrote:
On 4/24/19 1:36 AM, Atish Patra wrote:
This patch adds booti support for RISC-V Linux kernel. The existing
bootm method will also continue to work as it is.
It depends on the following kernel patch which adds the header to the
flat Image.
https://patchwork.kernel.org/patch/10913869/
Tested on HiFive Unleashed and QEMU.
Currently, compressed images such as Image.gz are not supported.
Signed-off-by: Atish Patra
---
arch/riscv/lib/Makefile | 1 +
arch/riscv/lib/image.c | 60 +
cmd/Kconfig | 2 +-
cmd/booti.c | 8 --
4 files changed, 68 insertions(+), 3 deletions(-)
create mode 100644 arch/riscv/lib/image.c
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 1c332db436a9..6ae6ebbeafda 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -7,6 +7,7 @@
# Rick Chen, Andes Technology Corporation
obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
obj-$(CONFIG_CMD_GO) += boot.o
obj-y += cache.o
obj-$(CONFIG_RISCV_RDTIME) += rdtime.o
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
new file mode 100644
index ..99c2e31066a3
--- /dev/null
+++ b/arch/riscv/lib/image.c
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Western Digital Corporation or its affiliates.
+ * Authors:
+ * Atish Patra
+ * Based on arm/lib/image.c
+ */
+
+#include
+#include
+#include
+#include
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* ASCII version of "RISCV" defined in Linux kernel */
+#define LINUX_RISCV_IMAGE_MAGIC 0x5643534952
+
+struct linux_image_h {
+ uint32_tcode0; /* Executable code */
+ uint32_tcode1; /* Executable code */
+ uint64_ttext_offset;/* Image load offset */
+ uint64_timage_size; /* Effective Image size */
+ uint64_tres1; /* reserved */
+ uint64_tmagic; /* Magic number */
+ uint32_tres2; /* reserved */
+ uint32_tres3; /* reserved */
+};
+
+int booti_setup(ulong image, ulong *relocated_addr, ulong *size,
+ bool force_reloc)
+{
+ struct linux_image_h *lhdr;
+ uint64_t dst;
+ uint64_t image_size, text_offset;
+
+ *relocated_addr = image;
You're setting this here to $image, but you're overriding this at the
end of the function again with gd->ram_base + text_offset , is that
intended?
My bad. I will remove it.
+ lhdr = (struct linux_image_h *)map_sysmem(image, 0);
+
+ if (lhdr->magic != LINUX_RISCV_IMAGE_MAGIC) {
+ puts("Bad Linux RISCV Image magic!\n");
+ return 1;
+ }
+
+ if (lhdr->image_size != 0) {
+ image_size = lhdr->image_size;
+ text_offset = lhdr->text_offset;
Maybe you can use lhdr->* directly and get rid of these local variables ?
Done.
+ } else {
+ puts("Image lacks image_size field, Error!!\n");
error, lowercase . And use one exclamation mark.
+ return 1;
Use errno.h return code instead.
+ }
+ *size = image_size;
+ dst = gd->ram_base;
+ *relocated_addr = dst + text_offset;
Use gd->ram_base instead of $dst and drop $dst altogether.
I have addressed all the comments. I will send a v2 soon.
Regards,
Atish
+
[...]
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] RISCV: image: Add booti support.
On 4/24/19 1:36 AM, Atish Patra wrote:
> This patch adds booti support for RISC-V Linux kernel. The existing
> bootm method will also continue to work as it is.
>
> It depends on the following kernel patch which adds the header to the
> flat Image.
>
> https://patchwork.kernel.org/patch/10913869/
>
> Tested on HiFive Unleashed and QEMU.
> Currently, compressed images such as Image.gz are not supported.
>
> Signed-off-by: Atish Patra
> ---
> arch/riscv/lib/Makefile | 1 +
> arch/riscv/lib/image.c | 60 +
> cmd/Kconfig | 2 +-
> cmd/booti.c | 8 --
> 4 files changed, 68 insertions(+), 3 deletions(-)
> create mode 100644 arch/riscv/lib/image.c
>
> diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
> index 1c332db436a9..6ae6ebbeafda 100644
> --- a/arch/riscv/lib/Makefile
> +++ b/arch/riscv/lib/Makefile
> @@ -7,6 +7,7 @@
> # Rick Chen, Andes Technology Corporation
>
> obj-$(CONFIG_CMD_BOOTM) += bootm.o
> +obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
> obj-$(CONFIG_CMD_GO) += boot.o
> obj-y+= cache.o
> obj-$(CONFIG_RISCV_RDTIME) += rdtime.o
> diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
> new file mode 100644
> index ..99c2e31066a3
> --- /dev/null
> +++ b/arch/riscv/lib/image.c
> @@ -0,0 +1,60 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Western Digital Corporation or its affiliates.
> + * Authors:
> + * Atish Patra
> + * Based on arm/lib/image.c
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/* ASCII version of "RISCV" defined in Linux kernel */
> +#define LINUX_RISCV_IMAGE_MAGIC 0x5643534952
> +
> +struct linux_image_h {
> + uint32_tcode0; /* Executable code */
> + uint32_tcode1; /* Executable code */
> + uint64_ttext_offset;/* Image load offset */
> + uint64_timage_size; /* Effective Image size */
> + uint64_tres1; /* reserved */
> + uint64_tmagic; /* Magic number */
> + uint32_tres2; /* reserved */
> + uint32_tres3; /* reserved */
> +};
> +
> +int booti_setup(ulong image, ulong *relocated_addr, ulong *size,
> + bool force_reloc)
> +{
> + struct linux_image_h *lhdr;
> + uint64_t dst;
> + uint64_t image_size, text_offset;
> +
> + *relocated_addr = image;
You're setting this here to $image, but you're overriding this at the
end of the function again with gd->ram_base + text_offset , is that
intended?
> + lhdr = (struct linux_image_h *)map_sysmem(image, 0);
> +
> + if (lhdr->magic != LINUX_RISCV_IMAGE_MAGIC) {
> + puts("Bad Linux RISCV Image magic!\n");
> + return 1;
> + }
> +
> + if (lhdr->image_size != 0) {
> + image_size = lhdr->image_size;
> + text_offset = lhdr->text_offset;
Maybe you can use lhdr->* directly and get rid of these local variables ?
> + } else {
> + puts("Image lacks image_size field, Error!!\n");
error, lowercase . And use one exclamation mark.
> + return 1;
Use errno.h return code instead.
> + }
> + *size = image_size;
> + dst = gd->ram_base;
> + *relocated_addr = dst + text_offset;
Use gd->ram_base instead of $dst and drop $dst altogether.
> +
[...]
--
Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] RISCV: image: Add booti support.
This patch adds booti support for RISC-V Linux kernel. The existing
bootm method will also continue to work as it is.
It depends on the following kernel patch which adds the header to the
flat Image.
https://patchwork.kernel.org/patch/10913869/
Tested on HiFive Unleashed and QEMU.
Currently, compressed images such as Image.gz are not supported.
Signed-off-by: Atish Patra
---
arch/riscv/lib/Makefile | 1 +
arch/riscv/lib/image.c | 60 +
cmd/Kconfig | 2 +-
cmd/booti.c | 8 --
4 files changed, 68 insertions(+), 3 deletions(-)
create mode 100644 arch/riscv/lib/image.c
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 1c332db436a9..6ae6ebbeafda 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -7,6 +7,7 @@
# Rick Chen, Andes Technology Corporation
obj-$(CONFIG_CMD_BOOTM) += bootm.o
+obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
obj-$(CONFIG_CMD_GO) += boot.o
obj-y += cache.o
obj-$(CONFIG_RISCV_RDTIME) += rdtime.o
diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c
new file mode 100644
index ..99c2e31066a3
--- /dev/null
+++ b/arch/riscv/lib/image.c
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Western Digital Corporation or its affiliates.
+ * Authors:
+ * Atish Patra
+ * Based on arm/lib/image.c
+ */
+
+#include
+#include
+#include
+#include
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* ASCII version of "RISCV" defined in Linux kernel */
+#define LINUX_RISCV_IMAGE_MAGIC 0x5643534952
+
+struct linux_image_h {
+ uint32_tcode0; /* Executable code */
+ uint32_tcode1; /* Executable code */
+ uint64_ttext_offset;/* Image load offset */
+ uint64_timage_size; /* Effective Image size */
+ uint64_tres1; /* reserved */
+ uint64_tmagic; /* Magic number */
+ uint32_tres2; /* reserved */
+ uint32_tres3; /* reserved */
+};
+
+int booti_setup(ulong image, ulong *relocated_addr, ulong *size,
+ bool force_reloc)
+{
+ struct linux_image_h *lhdr;
+ uint64_t dst;
+ uint64_t image_size, text_offset;
+
+ *relocated_addr = image;
+
+ lhdr = (struct linux_image_h *)map_sysmem(image, 0);
+
+ if (lhdr->magic != LINUX_RISCV_IMAGE_MAGIC) {
+ puts("Bad Linux RISCV Image magic!\n");
+ return 1;
+ }
+
+ if (lhdr->image_size != 0) {
+ image_size = lhdr->image_size;
+ text_offset = lhdr->text_offset;
+ } else {
+ puts("Image lacks image_size field, Error!!\n");
+ return 1;
+ }
+ *size = image_size;
+ dst = gd->ram_base;
+ *relocated_addr = dst + text_offset;
+
+ unmap_sysmem(lhdr);
+
+ return 0;
+}
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 2bdbfcb3d091..d427b66d3714 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -212,7 +212,7 @@ config CMD_BOOTZ
config CMD_BOOTI
bool "booti"
- depends on ARM64
+ depends on ARM64 || RISCV
default y
help
Boot an AArch64 Linux Kernel image from memory.
diff --git a/cmd/booti.c b/cmd/booti.c
index 04353b68eccc..c22ba9bae2e4 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -77,7 +77,11 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
bootm_disable_interrupts();
images.os.os = IH_OS_LINUX;
+ #ifdef CONFIG_RISCV_SMODE
+ images.os.arch = IH_ARCH_RISCV;
+ #elif CONFIG_ARM64
images.os.arch = IH_ARCH_ARM64;
+ #endif
ret = do_bootm_states(cmdtp, flag, argc, argv,
#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
BOOTM_STATE_RAMDISK |
@@ -92,7 +96,7 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
#ifdef CONFIG_SYS_LONGHELP
static char booti_help_text[] =
"[addr [initrd[:size]] [fdt]]\n"
- "- boot arm64 Linux Image stored in memory\n"
+ "- boot arm64/riscv Linux Image stored in memory\n"
"\tThe argument 'initrd' is optional and specifies the address\n"
"\tof an initrd in memory. The optional parameter ':size' allows\n"
"\tspecifying the size of a RAW initrd.\n"
@@ -107,5 +111,5 @@ static char booti_help_text[] =
U_BOOT_CMD(
booti, CONFIG_SYS_MAXARGS, 1, do_booti,
- "boot arm64 Linux Image image from memory", booti_help_text
+ "boot arm64/riscv Linux Image image from memory", booti_help_text
);
--
2.21.0
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
