Skip to content

Commit

Permalink
hw/mips/Kconfig: Remove ISA dependencies from MIPSsim board
Browse files Browse the repository at this point in the history
The board doesn't have a working ISA bus, only some I/O space.
Selecting ISA_BUS and including hw/isa/isa.h is not necessary.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-ID: <20230109204124.102592-3-shentey@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240213155005.109954-4-pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
  • Loading branch information
shentok authored and philmd committed Feb 15, 2024
1 parent 5939fc7 commit e6f2193
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 1 addition & 2 deletions hw/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ config MALTA

config MIPSSIM
bool
select ISA_BUS
select SERIAL_ISA
select SERIAL
select MIPSNET

config JAZZ
Expand Down
7 changes: 5 additions & 2 deletions hw/mips/mipssim.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "hw/clock.h"
#include "hw/mips/mips.h"
#include "hw/char/serial.h"
#include "hw/isa/isa.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
Expand Down Expand Up @@ -206,7 +205,11 @@ mips_mipssim_init(MachineState *machine)
cpu_mips_irq_init_cpu(cpu);
cpu_mips_clock_init(cpu);

/* Register 64 KB of ISA IO space at 0x1fd00000. */
/*
* Register 64 KB of ISA IO space at 0x1fd00000. But without interrupts
* (except for the hardcoded serial port interrupt) -device cannot work,
* so do not expose the ISA bus to the user.
*/
memory_region_init_alias(isa, NULL, "isa_mmio",
get_system_io(), 0, 0x00010000);
memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa);
Expand Down

0 comments on commit e6f2193

Please sign in to comment.