mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 07:13:54 -06:00
hw/sd/milkymist: Do not create SD card within the SD host controller
SD/MMC host controllers provide a SD Bus to plug SD cards, but don't come with SD card plugged in :) Let the machine/board model create and plug the SD cards when required. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <20200705211016.15241-5-f4bug@amsat.org>
This commit is contained in:
parent
ae7ba8e04a
commit
a8c73ca21a
2 changed files with 45 additions and 23 deletions
|
@ -34,6 +34,7 @@
|
|||
#include "elf.h"
|
||||
#include "milkymist-hw.h"
|
||||
#include "hw/display/milkymist_tmu2.h"
|
||||
#include "hw/sd/sd.h"
|
||||
#include "lm32.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "qemu/cutils.h"
|
||||
|
@ -83,11 +84,23 @@ static void main_cpu_reset(void *opaque)
|
|||
static DeviceState *milkymist_memcard_create(hwaddr base)
|
||||
{
|
||||
DeviceState *dev;
|
||||
DriveInfo *dinfo;
|
||||
|
||||
dev = qdev_new("milkymist-memcard");
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
|
||||
|
||||
dinfo = drive_get_next(IF_SD);
|
||||
if (dinfo) {
|
||||
DeviceState *card;
|
||||
|
||||
card = qdev_new(TYPE_SD_CARD);
|
||||
qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
|
||||
&error_fatal);
|
||||
qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"),
|
||||
&error_fatal);
|
||||
}
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue