Commit cf3dc71e authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create() 



DT_NOGRAPHIC handling will be moved to a MachineState field, and
it will be easier to change milkymist_init() to check that field.

Cc: Michael Walle <michael@walle.cc>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 6f0c894c

hw/lm32/milkymist-hw.h

+0 −4
Original line number Diff line number Diff line
@@ -108,10 +108,6 @@ static inline DeviceState *milkymist_tmu2_create(hwaddr base, 
    int nelements;

    int ver_major, ver_minor;



    if (display_type == DT_NOGRAPHIC) {

        return NULL;

    }



    /* check that GLX will work */

    d = XOpenDisplay(NULL);

    if (d == NULL) {

hw/lm32/milkymist.c

+3 −1
Original line number Diff line number Diff line
@@ -167,7 +167,9 @@ milkymist_init(MachineState *machine) 
    milkymist_memcard_create(0x60004000);

    milkymist_ac97_create(0x60005000, irq[4], irq[5], irq[6], irq[7]);

    milkymist_pfpu_create(0x60006000, irq[8]);

    if (display_type != DT_NOGRAPHIC) {

        milkymist_tmu2_create(0x60007000, irq[9]);

    }

    milkymist_minimac2_create(0x60008000, 0x30000000, irq[10], irq[11]);

    milkymist_softusb_create(0x6000f000, irq[15],

            0x20000000, 0x1000, 0x20020000, 0x2000);