@@ -10,16 +10,15 @@ CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
CONFIG_FSL_IMX31=y
CONFIG_MUSICPAL=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
@@ -37,9 +36,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,14 +58,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_NSERIES=y
CONFIG_RASPI=y
CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
@@ -1,6 +1,11 @@
config ARM_VIRT
bool
+config CHEETAH
+ bool
+ select OMAP
+ select TSC210X
+
config DIGIC
bool
select PTIMER
@@ -61,9 +66,26 @@ 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 PCI
+ select SD
+ select SERIAL
config PXA2XX
bool
@@ -77,6 +99,10 @@ config STELLARIS
config STRONGARM
bool
+config SX1
+ bool
+ select OMAP
+
config VERSATILE
bool
@@ -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
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). Signed-off-by: Thomas Huth <thuth@redhat.com> --- default-configs/arm-softmmu.mak | 15 +++------------ hw/arm/Kconfig | 26 ++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 13 deletions(-)