diff options
| -rw-r--r-- | default-configs/arm-softmmu.mak | 3 | ||||
| -rw-r--r-- | hw/arm/Kconfig | 7 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index af78e7c892..25e8f717ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y CONFIG_SPITZ=y CONFIG_TOSA=y CONFIG_Z2=y +CONFIG_COLLIE=y CONFIG_VGA=y CONFIG_TMP421=y @@ -97,5 +98,3 @@ CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y CONFIG_PCI_EXPRESS_DESIGNWARE=y - -CONFIG_STRONGARM=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index dfdc1b1fd6..a507144d9a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -169,6 +169,13 @@ config STELLARIS config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM config SX1 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 00328d1b0b..729e711b87 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) += tosa.o obj-$(CONFIG_Z2) += z2.o obj-$(CONFIG_REALVIEW) += realview.o obj-$(CONFIG_STELLARIS) += stellaris.o -obj-$(CONFIG_STRONGARM) += collie.o +obj-$(CONFIG_COLLIE) += collie.o obj-$(CONFIG_VERSATILE) += versatilepb.o obj-$(CONFIG_VEXPRESS) += vexpress.o obj-$(CONFIG_ZYNQ) += xilinx_zynq.o |