Remove upstreamed patches
These patches are merged already. Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
8e8806b6aa
commit
5d20f007df
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -1,40 +0,0 @@
|
|||
From 9c139c603f308608cf4a60426779edfe031181ca Mon Sep 17 00:00:00 2001
|
||||
From: Bin Meng <bmeng.cn@gmail.com>
|
||||
Date: Tue, 24 May 2022 12:31:12 +0800
|
||||
Subject: [PATCH 1/6] riscv: sifive: unmatched: Adjust for big ramdisk image
|
||||
|
||||
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>
|
||||
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.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 08776466..fa734a66 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.36.1
|
||||
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
From a47efb51d082b419a7b76a51682390b413ed7771 Mon Sep 17 00:00:00 2001
|
||||
From: Bin Meng <bmeng.cn@gmail.com>
|
||||
Date: Tue, 24 May 2022 12:31:13 +0800
|
||||
Subject: [PATCH 2/6] riscv: sifive: unleashed: Set kernel_comp_addr_r for
|
||||
compressed kernel
|
||||
|
||||
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>
|
||||
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.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 c8a62068..ce38b701 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 920f3140..96e2eb67 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.36.1
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 33b94b09b2e45e0c9058415135338e4fd589de3e Mon Sep 17 00:00:00 2001
|
||||
From: Bin Meng <bmeng.cn@gmail.com>
|
||||
Date: Tue, 24 May 2022 12:31:14 +0800
|
||||
Subject: [PATCH 3/6] riscv: qemu: Set kernel_comp_addr_r for compressed kernel
|
||||
|
||||
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>
|
||||
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.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 618c3b63..f462895f 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.36.1
|
||||
|
||||
|
|
@ -30,9 +30,6 @@ Patch7: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
|||
Patch8: rockchip-general-fixes.patch
|
||||
|
||||
# RISC-V (riscv64) patches
|
||||
Patch40: 0001-riscv-sifive-unmatched-Adjust-for-big-ramdisk-image.patch
|
||||
Patch41: 0002-riscv-sifive-unleashed-Set-kernel_comp_addr_r-for-co.patch
|
||||
Patch42: 0003-riscv-qemu-Set-kernel_comp_addr_r-for-compressed-ker.patch
|
||||
Patch43: 0004-riscv-sifive-unmatched-disable-FDT-and-initrd-reloca.patch
|
||||
Patch44: 0005-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch
|
||||
Patch45: 0006-board-sifive-spl-Set-remote-thermal-of-TMP451-to-85-.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue