diff options
| author | Thomas Huth <thuth@redhat.com> | 2019-02-07 17:12:14 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-05-13 09:36:31 +0200 |
| commit | 4826ac6d19283133b3ec77630a24186c1f2dabc9 (patch) | |
| tree | 8f90276ee727c9d65327c4901627ec9b7ea61975 | |
| parent | 59dd3eb3a6f13a0b01987750bcae2700dc9f0dfc (diff) | |
hw/arm: Express dependencies of the OMAP machines with Kconfig
Add Kconfig dependencies for the OMAP machines (cheetah, n800, n810,
sx1 and sx1-v1).
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | default-configs/arm-softmmu.mak | 17 | ||||
| -rw-r--r-- | hw/arm/Kconfig | 25 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 3 |
3 files changed, 31 insertions, 14 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 0a4d293f8a..b7ed3c530b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -12,16 +12,16 @@ CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y CONFIG_MUSICPAL=y +CONFIG_MUSCA=y +CONFIG_CHEETAH=y +CONFIG_SX1=y +CONFIG_NSERIES=y CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y CONFIG_MAX7310=y -CONFIG_TWL92230=y -CONFIG_TSC2005=y -CONFIG_LM832X=y -CONFIG_TMP105=y CONFIG_TMP421=y CONFIG_PCA9552=y CONFIG_STELLARIS=y @@ -39,9 +39,7 @@ CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y -CONFIG_PFLASH_CFI01=y CONFIG_MICRODRIVE=y -CONFIG_USB_MUSB=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y @@ -61,15 +59,8 @@ CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y CONFIG_DIGIC=y -CONFIG_OMAP=y -CONFIG_TSC210X=y -CONFIG_BLIZZARD=y -CONFIG_ONENAND=y -CONFIG_TUSB6010=y CONFIG_MAINSTONE=y CONFIG_MPS2=y -CONFIG_MUSCA=y -CONFIG_NSERIES=y CONFIG_RASPI=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b9f3c3c232..71126254ff 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -2,6 +2,11 @@ config ARM_VIRT bool imply VFIO_PLATFORM +config CHEETAH + bool + select OMAP + select TSC210X + config DIGIC bool select PTIMER @@ -58,9 +63,25 @@ config NETDUINO2 config NSERIES bool + select OMAP + select TMP105 # tempature sensor + select BLIZZARD # LCD/TV controller + select ONENAND + select TSC210X # touchscreen/sensors/audio + select TSC2005 # touchscreen/sensors/keypad + select LM832X # GPIO keyboard chip + select TWL92230 # energy-management + select TUSB6010 config OMAP bool + select FRAMEBUFFER + select I2C + select ECC + select NAND + select PFLASH_CFI01 + select SD + select SERIAL config PXA2XX bool @@ -74,6 +95,10 @@ config STELLARIS config STRONGARM bool +config SX1 + bool + select OMAP + config VERSATILE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fa57c7c770..8302b8df1d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -9,7 +9,8 @@ obj-$(CONFIG_MAINSTONE) += mainstone.o obj-$(CONFIG_MUSICPAL) += musicpal.o obj-$(CONFIG_NETDUINO2) += netduino2.o obj-$(CONFIG_NSERIES) += nseries.o -obj-$(CONFIG_OMAP) += omap_sx1.o palm.o +obj-$(CONFIG_SX1) += omap_sx1.o +obj-$(CONFIG_CHEETAH) += palm.o obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o obj-$(CONFIG_REALVIEW) += realview.o obj-$(CONFIG_STELLARIS) += stellaris.o |