rpms
/
uboot-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase riscv64 patches for RC4 

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2019-12-05 11:22:37 +02:00
parent fbdd0d0c77
commit ec8b6389cf
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
riscv-bootargs-preboot.patch
View File

@ -1,22 +1,22 @@
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 7e1e5a77..792afee8 100644 index 33776f03..42ec49eb 100644
--- a/configs/qemu-riscv64_smode_defconfig --- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig +++ b/configs/qemu-riscv64_smode_defconfig
@@ -11,3 +11,7 @@ CONFIG_CMD_BOOTEFI_SELFTEST=y @@ -13,3 +13,7 @@ CONFIG_CMD_NVEDIT_EFI=y
CONFIG_CMD_NVEDIT_EFI=y
# CONFIG_CMD_MII is not set # CONFIG_CMD_MII is not set
CONFIG_OF_PRIOR_STAGE=y CONFIG_OF_PRIOR_STAGE=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_BOOTARGS=y +CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0 earlycon" +CONFIG_BOOTARGS="console=ttyS0 earlycon"
+CONFIG_USE_PREBOOT=y +CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x10000;" +CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x10000;"
diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig
index 48865e5f..8a4bc0b7 100644 index 790da976..dff48057 100644
--- a/configs/sifive_fu540_defconfig --- a/configs/sifive_fu540_defconfig
+++ b/configs/sifive_fu540_defconfig +++ b/configs/sifive_fu540_defconfig
@@ -9,3 +9,5 @@ CONFIG_MISC_INIT_R=y @@ -11,3 +11,5 @@ CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_CPUINFO=y
CONFIG_DISPLAY_BOARDINFO=y CONFIG_DISPLAY_BOARDINFO=y
CONFIG_OF_PRIOR_STAGE=y CONFIG_OF_PRIOR_STAGE=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_BOOTARGS=y +CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttySIF0 earlycon" +CONFIG_BOOTARGS="console=ttySIF0 earlycon"

10
uboot-riscv-def-kernel_comp_addr_r-filesize.patch → uboot-riscv-def-kernel_comp_addr_r.patch
View File

@ -1,26 +1,24 @@
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index bc831a84..442f0f9d 100644 index 801d2f5c..0bcadb0f 100644
--- a/include/configs/qemu-riscv.h --- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h
@@ -60,6 +60,8 @@ @@ -59,6 +59,7 @@
"scriptaddr=0x88100000\0" \ "scriptaddr=0x88100000\0" \
"pxefile_addr_r=0x88200000\0" \ "pxefile_addr_r=0x88200000\0" \
"ramdisk_addr_r=0x88300000\0" \ "ramdisk_addr_r=0x88300000\0" \
+ "kernel_comp_addr_r=0x90000000\0" \ + "kernel_comp_addr_r=0x90000000\0" \
+ "filesize=0x4000000\0" \
BOOTENV BOOTENV
#endif #endif
diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h
index 59cf0281..5114dde1 100644 index 4fef86c1..864bb051 100644
--- a/include/configs/sifive-fu540.h --- a/include/configs/sifive-fu540.h
+++ b/include/configs/sifive-fu540.h +++ b/include/configs/sifive-fu540.h
@@ -40,6 +40,8 @@ @@ -39,6 +39,7 @@
"scriptaddr=0x88100000\0" \ "scriptaddr=0x88100000\0" \
"pxefile_addr_r=0x88200000\0" \ "pxefile_addr_r=0x88200000\0" \
"ramdisk_addr_r=0x88300000\0" \ "ramdisk_addr_r=0x88300000\0" \
+ "kernel_comp_addr_r=0x90000000\0" \ + "kernel_comp_addr_r=0x90000000\0" \
+ "filesize=0x4000000\0" \
BOOTENV BOOTENV
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
uboot-tools.spec
View File

@ -64,7 +64,7 @@ Patch25: uboot-addappend.patch
# Not upstream # Not upstream
# Define kernel_comp_addr_r and filesize for booti Image.gz support # Define kernel_comp_addr_r and filesize for booti Image.gz support
Patch26: uboot-riscv-def-kernel_comp_addr_r-filesize.patch Patch26: uboot-riscv-def-kernel_comp_addr_r.patch
# Not upstream (but posted) # Not upstream (but posted)
# See: https://patchwork.ozlabs.org/patch/1196837/ # See: https://patchwork.ozlabs.org/patch/1196837/