diff options
| author | Gavin Shan <gshan@redhat.com> | 2023-12-04 10:47:26 +1000 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-01-05 16:20:15 +0100 |
| commit | cd75cc633709ceb5ef26a7fc0bbc6e7c6444a9c8 (patch) | |
| tree | 29f5ff0c80bf0bedced9c54ba7f144c5dfa4d951 /hw/riscv/shakti_c.c | |
| parent | 3e71f4a706560406e320eaff7d622efd12912e7e (diff) | |
| download | qemu-cd75cc633709ceb5ef26a7fc0bbc6e7c6444a9c8.zip qemu-cd75cc633709ceb5ef26a7fc0bbc6e7c6444a9c8.tar.gz qemu-cd75cc633709ceb5ef26a7fc0bbc6e7c6444a9c8.tar.bz2 | |
hw/riscv/shakti_c: Check CPU type in machine_run_board_init()
Set mc->valid_cpu_types so that the user specified CPU type can
be validated in machine_run_board_init(). We needn't to do it
by ourselves.
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231204004726.483558-10-gshan@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Diffstat (limited to 'hw/riscv/shakti_c.c')
| -rw-r--r-- | hw/riscv/shakti_c.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index 12ea74b..3888034 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -28,7 +28,6 @@ #include "exec/address-spaces.h" #include "hw/riscv/boot.h" - static const struct MemmapEntry { hwaddr base; hwaddr size; @@ -47,12 +46,6 @@ static void shakti_c_machine_state_init(MachineState *mstate) ShaktiCMachineState *sms = RISCV_SHAKTI_MACHINE(mstate); MemoryRegion *system_memory = get_system_memory(); - /* Allow only Shakti C CPU for this platform */ - if (strcmp(mstate->cpu_type, TYPE_RISCV_CPU_SHAKTI_C) != 0) { - error_report("This board can only be used with Shakti C CPU"); - exit(1); - } - /* Initialize SoC */ object_initialize_child(OBJECT(mstate), "soc", &sms->soc, TYPE_RISCV_SHAKTI_SOC); @@ -82,9 +75,15 @@ static void shakti_c_machine_instance_init(Object *obj) static void shakti_c_machine_class_init(ObjectClass *klass, void *data) { MachineClass *mc = MACHINE_CLASS(klass); + static const char * const valid_cpu_types[] = { + RISCV_CPU_TYPE_NAME("shakti-c"), + NULL + }; + mc->desc = "RISC-V Board compatible with Shakti SDK"; mc->init = shakti_c_machine_state_init; mc->default_cpu_type = TYPE_RISCV_CPU_SHAKTI_C; + mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id = "riscv.shakti.c.ram"; } |