All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image
@ 2022-05-24  4:31 Bin Meng
  2022-05-24  4:31 ` [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel Bin Meng
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Bin Meng @ 2022-05-24  4:31 UTC (permalink / raw)
  To: Rick Chen, Leo Liang, U-Boot Mailing List; +Cc: Green Wan, Pragnesh Patel

Move kernel_comp_addr_r to an address that comes before the ramdisk
image, since the decompressed kernel size is known to us. This way
we can allow big ramdisk image to be loaded.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 include/configs/sifive-unmatched.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index 087764666b..fa734a66be 100644
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -56,12 +56,12 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x84000000\0" \
-	"fdt_addr_r=0x88000000\0" \
-	"scriptaddr=0x88100000\0" \
-	"pxefile_addr_r=0x88200000\0" \
-	"ramdisk_addr_r=0x88300000\0" \
-	"kernel_comp_addr_r=0x90000000\0" \
+	"kernel_comp_addr_r=0x88000000\0" \
 	"kernel_comp_size=0x4000000\0" \
+	"fdt_addr_r=0x8c000000\0" \
+	"scriptaddr=0x8c100000\0" \
+	"pxefile_addr_r=0x8c200000\0" \
+	"ramdisk_addr_r=0x8c300000\0" \
 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel
  2022-05-24  4:31 [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Bin Meng
@ 2022-05-24  4:31 ` Bin Meng
  2022-05-26  9:08   ` Leo Liang
  2022-05-24  4:31 ` [PATCH 3/3] riscv: qemu: " Bin Meng
  2022-05-26  9:06 ` [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Leo Liang
  2 siblings, 1 reply; 6+ messages in thread
From: Bin Meng @ 2022-05-24  4:31 UTC (permalink / raw)
  To: Rick Chen, Leo Liang, U-Boot Mailing List; +Cc: Green Wan, Pragnesh Patel

Set kernel_comp_addr_r and kernel_comp_size for compressed kernel.
Adjust existing addresses for ramdisk, so that kernel_comp_addr_r
comes before the ramdisk image, since the decompressed kernel size
is known to us. This way we can allow big ramdisk image to be loaded.

Update unleashed.rst to remove the manual environment configuration
for compressed kernel boot.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 doc/board/sifive/unleashed.rst     |  2 --
 include/configs/sifive-unleashed.h | 10 ++++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/board/sifive/unleashed.rst b/doc/board/sifive/unleashed.rst
index c8a62068a7..ce38b701d7 100644
--- a/doc/board/sifive/unleashed.rst
+++ b/doc/board/sifive/unleashed.rst
@@ -216,8 +216,6 @@ Or if you want to use a compressed kernel image file such as Image.gz
             1.2 MiB/s
    done
    Bytes transferred = 4809458 (4962f2 hex)
-   =>setenv kernel_comp_addr_r 0x90000000
-   =>setenv kernel_comp_size 0x500000
 
 By this time, correct kernel image is loaded and required environment variables
 are set. You can proceed to load the ramdisk and device tree from the tftp server
diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 920f3140f6..96e2eb6798 100644
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -61,12 +61,14 @@
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
-	"fdt_addr_r=0x88000000\0" \
-	"scriptaddr=0x88100000\0" \
+	"kernel_comp_addr_r=0x88000000\0" \
+	"kernel_comp_size=0x4000000\0" \
+	"fdt_addr_r=0x8c000000\0" \
+	"scriptaddr=0x8c100000\0" \
 	"script_offset_f=0x1fff000\0" \
 	"script_size_f=0x1000\0" \
-	"pxefile_addr_r=0x88200000\0" \
-	"ramdisk_addr_r=0x88300000\0" \
+	"pxefile_addr_r=0x8c200000\0" \
+	"ramdisk_addr_r=0x8c300000\0" \
 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] riscv: qemu: Set kernel_comp_addr_r for compressed kernel
  2022-05-24  4:31 [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Bin Meng
  2022-05-24  4:31 ` [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel Bin Meng
@ 2022-05-24  4:31 ` Bin Meng
  2022-05-26  9:09   ` Leo Liang
  2022-05-26  9:06 ` [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Leo Liang
  2 siblings, 1 reply; 6+ messages in thread
From: Bin Meng @ 2022-05-24  4:31 UTC (permalink / raw)
  To: Rick Chen, Leo Liang, U-Boot Mailing List; +Cc: Green Wan, Pragnesh Patel

Set kernel_comp_addr_r and kernel_comp_size for compressed kernel.
Adjust existing addresses for ramdisk, so that kernel_comp_addr_r
comes before the ramdisk image, since the decompressed kernel size
is known to us. This way we can allow big ramdisk image to be loaded.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 include/configs/qemu-riscv.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 618c3b63d4..f462895fb5 100644
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -54,10 +54,12 @@
 	"fdt_high=0xffffffffffffffff\0" \
 	"initrd_high=0xffffffffffffffff\0" \
 	"kernel_addr_r=0x84000000\0" \
-	"fdt_addr_r=0x88000000\0" \
-	"scriptaddr=0x88100000\0" \
-	"pxefile_addr_r=0x88200000\0" \
-	"ramdisk_addr_r=0x88300000\0" \
+	"kernel_comp_addr_r=0x88000000\0" \
+	"kernel_comp_size=0x4000000\0" \
+	"fdt_addr_r=0x8c000000\0" \
+	"scriptaddr=0x8c100000\0" \
+	"pxefile_addr_r=0x8c200000\0" \
+	"ramdisk_addr_r=0x8c300000\0" \
 	BOOTENV
 #endif
 
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image
  2022-05-24  4:31 [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Bin Meng
  2022-05-24  4:31 ` [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel Bin Meng
  2022-05-24  4:31 ` [PATCH 3/3] riscv: qemu: " Bin Meng
@ 2022-05-26  9:06 ` Leo Liang
  2 siblings, 0 replies; 6+ messages in thread
From: Leo Liang @ 2022-05-26  9:06 UTC (permalink / raw)
  To: Bin Meng; +Cc: Rick Chen, U-Boot Mailing List, Green Wan, Pragnesh Patel

On Tue, May 24, 2022 at 12:31:12PM +0800, Bin Meng wrote:
> Move kernel_comp_addr_r to an address that comes before the ramdisk
> image, since the decompressed kernel size is known to us. This way
> we can allow big ramdisk image to be loaded.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> 
>  include/configs/sifive-unmatched.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel
  2022-05-24  4:31 ` [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel Bin Meng
@ 2022-05-26  9:08   ` Leo Liang
  0 siblings, 0 replies; 6+ messages in thread
From: Leo Liang @ 2022-05-26  9:08 UTC (permalink / raw)
  To: Bin Meng; +Cc: Rick Chen, U-Boot Mailing List, Green Wan, Pragnesh Patel

On Tue, May 24, 2022 at 12:31:13PM +0800, Bin Meng wrote:
> Set kernel_comp_addr_r and kernel_comp_size for compressed kernel.
> Adjust existing addresses for ramdisk, so that kernel_comp_addr_r
> comes before the ramdisk image, since the decompressed kernel size
> is known to us. This way we can allow big ramdisk image to be loaded.
> 
> Update unleashed.rst to remove the manual environment configuration
> for compressed kernel boot.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> 
>  doc/board/sifive/unleashed.rst     |  2 --
>  include/configs/sifive-unleashed.h | 10 ++++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] riscv: qemu: Set kernel_comp_addr_r for compressed kernel
  2022-05-24  4:31 ` [PATCH 3/3] riscv: qemu: " Bin Meng
@ 2022-05-26  9:09   ` Leo Liang
  0 siblings, 0 replies; 6+ messages in thread
From: Leo Liang @ 2022-05-26  9:09 UTC (permalink / raw)
  To: Bin Meng; +Cc: Rick Chen, U-Boot Mailing List, Green Wan, Pragnesh Patel

On Tue, May 24, 2022 at 12:31:14PM +0800, Bin Meng wrote:
> Set kernel_comp_addr_r and kernel_comp_size for compressed kernel.
> Adjust existing addresses for ramdisk, so that kernel_comp_addr_r
> comes before the ramdisk image, since the decompressed kernel size
> is known to us. This way we can allow big ramdisk image to be loaded.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
> 
>  include/configs/qemu-riscv.h | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-05-26  9:09 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-24  4:31 [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Bin Meng
2022-05-24  4:31 ` [PATCH 2/3] riscv: sifive: unleashed: Set kernel_comp_addr_r for compressed kernel Bin Meng
2022-05-26  9:08   ` Leo Liang
2022-05-24  4:31 ` [PATCH 3/3] riscv: qemu: " Bin Meng
2022-05-26  9:09   ` Leo Liang
2022-05-26  9:06 ` [PATCH 1/3] riscv: sifive: unmatched: Adjust for big ramdisk image Leo Liang

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.