| Message ID | dc19879156f33c8e2d2a7447b803777ece8634ac.1254875337.git.quintela@redhat.com |
|---|---|
| State | Accepted |
| Commit | 2f3c407d81fb4ee4d050c8a8376101b167c0d0c4 |
| Headers | show |
diff --git a/Makefile.hw b/Makefile.hw index 354d889..9e40439 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -19,7 +19,8 @@ obj-y += watchdog.o obj-$(CONFIG_ECC) += ecc.o obj-$(CONFIG_NAND) += nand.o -obj-y += m48t59.o escc.o +obj-y += m48t59.o +obj-$(CONFIG_ESCC) += escc.o # PCI watchdog devices obj-y += wdt_i6300esb.o diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 93172b8..783b066 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_ESCC=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 05eb3b6..e04d2c5 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_ESCC=y diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 4259fcf..9b1ac09 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -3,3 +3,4 @@ CONFIG_GDBSTUB_XML=y CONFIG_USB_OHCI=y CONFIG_ISA_MMIO=y +CONFIG_ESCC=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index efb31bc..bec73af 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -3,3 +3,5 @@ CONFIG_QDEV_ADDR=y CONFIG_ECC=y CONFIG_ESP=y +CONFIG_ESCC=y +
Signed-off-by: Juan Quintela <quintela@redhat.com> --- Makefile.hw | 3 ++- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/ppcemb-softmmu.mak | 1 + default-configs/sparc-softmmu.mak | 2 ++ 5 files changed, 7 insertions(+), 1 deletions(-)