82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
|
|
index b8ccf8f4..c4463115 100644
|
|
--- a/configs/qemu-riscv64_defconfig
|
|
+++ b/configs/qemu-riscv64_defconfig
|
|
@@ -20,3 +20,12 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_DM_MTD=y
|
|
CONFIG_FLASH_SHOW_PROGRESS=0
|
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
|
+CONFIG_NR_CPUS=32
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x20000;"
|
|
+CONFIG_CMD_SBI=y
|
|
+CONFIG_SYSRESET=y
|
|
+CONFIG_SYSRESET_SBI=y
|
|
+CONFIG_CMD_POWEROFF=y
|
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
|
+CONFIG_FS_BTRFS=y
|
|
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
|
|
index 6baad1de..71c443d2 100644
|
|
--- a/configs/qemu-riscv64_smode_defconfig
|
|
+++ b/configs/qemu-riscv64_smode_defconfig
|
|
@@ -23,3 +23,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_DM_MTD=y
|
|
CONFIG_FLASH_SHOW_PROGRESS=0
|
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
|
+CONFIG_CMD_SBI=y
|
|
+CONFIG_SYSRESET=y
|
|
+CONFIG_SYSRESET_SBI=y
|
|
+CONFIG_CMD_POWEROFF=y
|
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
|
diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
|
|
index f663a137..5365b874 100644
|
|
--- a/configs/qemu-riscv64_spl_defconfig
|
|
+++ b/configs/qemu-riscv64_spl_defconfig
|
|
@@ -25,3 +25,6 @@ CONFIG_DM_MTD=y
|
|
CONFIG_FLASH_SHOW_PROGRESS=0
|
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
|
# CONFIG_BINMAN_FDT is not set
|
|
+CONFIG_NR_CPUS=32
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="cp.l ${fdtcontroladdr} ${fdt_addr_r} 0x20000;"
|
|
diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
|
|
index f68171c9..9ff2666c 100644
|
|
--- a/configs/sifive_unleashed_defconfig
|
|
+++ b/configs/sifive_unleashed_defconfig
|
|
@@ -40,3 +40,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
CONFIG_SPL_CLK=y
|
|
CONFIG_DM_MTD=y
|
|
+CONFIG_CMD_SBI=y
|
|
+CONFIG_SYSRESET=y
|
|
+CONFIG_SYSRESET_SBI=y
|
|
+CONFIG_CMD_POWEROFF=y
|
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
|
diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
|
|
index 7c6c5b4d..c822f9d5 100644
|
|
--- a/configs/sifive_unmatched_defconfig
|
|
+++ b/configs/sifive_unmatched_defconfig
|
|
@@ -63,3 +63,9 @@ CONFIG_SCSI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_XHCI_PCI=y
|
|
+CONFIG_CMD_SBI=y
|
|
+CONFIG_SYSRESET=y
|
|
+CONFIG_SYSRESET_SBI=y
|
|
+CONFIG_CMD_POWEROFF=y
|
|
+CONFIG_SYSRESET_CMD_POWEROFF=y
|
|
+CONFIG_FS_BTRFS=y
|
|
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
|
|
index 2f594bfc..c3ce49ba 100644
|
|
--- a/include/configs/qemu-riscv.h
|
|
+++ b/include/configs/qemu-riscv.h
|
|
@@ -31,8 +31,6 @@
|
|
|
|
#define CFG_EXTRA_ENV_SETTINGS \
|
|
CFG_STD_DEVICES_SETTINGS \
|
|
- "fdt_high=0xffffffffffffffff\0" \
|
|
- "initrd_high=0xffffffffffffffff\0" \
|
|
"kernel_addr_r=0x84000000\0" \
|
|
"kernel_comp_addr_r=0x88000000\0" \
|
|
"kernel_comp_size=0x4000000\0" \
|