diff options
| author | Michael Scott <mike@foundries.io> | 2019-04-10 23:19:38 -0700 |
|---|---|---|
| committer | Ricardo Salveti <ricardo@foundries.io> | 2019-04-22 20:16:29 -0300 |
| commit | 925c6317bf223937cbd4a55ce7739f2ae0fc8fd0 (patch) | |
| tree | b5d7a8716bb42ff122ee42556a9ae379fb483495 | |
| parent | af8d547a317c56f8103bb6c4695b90aebbb1d62b (diff) | |
riscv64: update to mainline 5.0.y
Signed-off-by: Michael Scott <mike@foundries.io>
| -rw-r--r-- | arch/riscv64/riscv64.cfg | 10 | ||||
| -rw-r--r-- | arch/riscv64/riscv64.scc | 1 | ||||
| -rw-r--r-- | bsp/riscv64/qemuriscv64-standard.scc | 1 | ||||
| -rw-r--r-- | bsp/riscv64/qemuriscv64.cfg | 58 | ||||
| -rw-r--r-- | bsp/riscv64/qemuriscv64.scc | 1 |
5 files changed, 64 insertions, 7 deletions
diff --git a/arch/riscv64/riscv64.cfg b/arch/riscv64/riscv64.cfg index 1c273b9..61a28a5 100644 --- a/arch/riscv64/riscv64.cfg +++ b/arch/riscv64/riscv64.cfg @@ -1,4 +1,12 @@ # Doesn't yet work right on RISC-V # CONFIG_DYNAMIC_FTRACE is not set -CONFIG_HVC_RISCV_SBI=y +CONFIG_RISCV=y +CONFIG_RISCV_ISA_C=y +CONFIG_RISCV_ISA_A=y + +CONFIG_RISCV_TIMER=y + +CONFIG_MMU=y + +CONFIG_SERIAL_EARLYCON_RISCV_SBI=y diff --git a/arch/riscv64/riscv64.scc b/arch/riscv64/riscv64.scc index 909d37e..eba9f8e 100644 --- a/arch/riscv64/riscv64.scc +++ b/arch/riscv64/riscv64.scc @@ -1 +1,2 @@ kconf hardware riscv64.cfg +include cfg/timer/hz_100.scc diff --git a/bsp/riscv64/qemuriscv64-standard.scc b/bsp/riscv64/qemuriscv64-standard.scc index 6447061..4f8f5e8 100644 --- a/bsp/riscv64/qemuriscv64-standard.scc +++ b/bsp/riscv64/qemuriscv64-standard.scc @@ -10,4 +10,5 @@ include features/bluetooth/bluetooth-uart.scc include features/ieee802154/ieee802154.scc include features/mac802154/mac802154.scc +include cfg/virtio.scc include qemuriscv64.scc diff --git a/bsp/riscv64/qemuriscv64.cfg b/bsp/riscv64/qemuriscv64.cfg index d51eed5..da849cc 100644 --- a/bsp/riscv64/qemuriscv64.cfg +++ b/bsp/riscv64/qemuriscv64.cfg @@ -1,14 +1,62 @@ +# +# RISC-V 64-bit +# +CONFIG_ARCH_RV64I=y +CONFIG_64BIT=y + +# +# Platform type +# +CONFIG_MAXPHYSMEM_128GB=y CONFIG_SMP=y -CONFIG_NR_CPUS=4 +CONFIG_NR_CPUS=8 CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_TUNE_GENERIC=y + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_ECAM=y +CONFIG_PCI_HOST_COMMON=y +CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCIEPORTBUS=y + +# +# Serial drivers +# CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_HVC_RISCV_SBI=y -# CONFIG_RCU_TRACE is not set + +# +# Non-8250 serial port support +# +CONFIG_VIRTIO_CONSOLE=y + +# +# IRQ chip support +# CONFIG_SIFIVE_PLIC=y CONFIG_CRYPTO_DEV_VIRTIO=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y + +# +# HACKS +# +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_HIGH_RES_TIMERS is not set +# CONFIG_PERF_EVENTS is not set +# CONFIG_PROFILING is not set +# CONFIG_REGULATOR is not set +# CONFIG_PREEMPT is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_SCHED_STACK_END_CHECK is not set +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BLK_DEV_IO_TRACE is not set diff --git a/bsp/riscv64/qemuriscv64.scc b/bsp/riscv64/qemuriscv64.scc index a8fb542..3ebe26d 100644 --- a/bsp/riscv64/qemuriscv64.scc +++ b/bsp/riscv64/qemuriscv64.scc @@ -1,6 +1,5 @@ include cfg/paravirt_kvm.scc include cfg/virtio.scc -include features/vfio/vfio.scc include cfg/usb-mass-storage.scc |