Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / board / emulation / qemu-riscv / Kconfig

diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index cf057e7..0818048 100644 (file)
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -13,27 +13,56 @@ config SYS_CONFIG_NAME
        default "qemu-riscv"
 
 config SYS_TEXT_BASE
+       default 0x81200000 if SPL
        default 0x80000000 if !RISCV_SMODE
-       default 0x80200000 if RISCV_SMODE
+       default 0x80200000 if RISCV_SMODE && ARCH_RV64I
+       default 0x80400000 if RISCV_SMODE && ARCH_RV32I
+
+config SPL_TEXT_BASE
+       default 0x80000000
+
+config SPL_OPENSBI_LOAD_ADDR
+       hex
+       default 0x81000000
 
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select GENERIC_RISCV
-       imply SYS_NS16550
-       imply VIRTIO_MMIO
-       imply VIRTIO_NET
-       imply VIRTIO_BLK
+       select SUPPORT_SPL
+       imply AHCI
+       imply SMP
+       imply BOARD_LATE_INIT
+       imply PCI_INIT_R
+       imply SPL_RAM_SUPPORT
+       imply SPL_RAM_DEVICE
+       imply CMD_PCI
+       imply CMD_POWEROFF
+       imply CMD_SCSI
        imply CMD_PING
-       imply CMD_FS_GENERIC
-       imply DOS_PARTITION
-       imply EFI_PARTITION
-       imply ISO_PARTITION
        imply CMD_EXT2
        imply CMD_EXT4
        imply CMD_FAT
-       imply BOARD_LATE_INIT
-       imply OF_BOARD_SETUP
+       imply CMD_FS_GENERIC
+       imply DOS_PARTITION
+       imply ISO_PARTITION
+       imply EFI_PARTITION
+       imply SCSI_AHCI
+       imply AHCI_PCI
+       imply E1000
+       imply NVME
+       imply PCI
+       imply DM_PCI
+       imply PCIE_ECAM_GENERIC
+       imply SCSI
+       imply DM_SCSI
+       imply SYS_NS16550
        imply SIFIVE_SERIAL
-       imply SMP
+       imply SYSRESET
+       imply SYSRESET_CMD_POWEROFF
+       imply SYSRESET_SYSCON
+       imply VIRTIO_MMIO
+       imply VIRTIO_PCI
+       imply VIRTIO_NET
+       imply VIRTIO_BLK
 
 endif