aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/microblaze/Kconfig7
-rw-r--r--drivers/block/Kconfig2
-rw-r--r--drivers/char/Kconfig2
-rw-r--r--drivers/gpio/Kconfig2
-rw-r--r--drivers/input/serio/Kconfig2
-rw-r--r--drivers/of/Kconfig8
-rw-r--r--drivers/spi/Kconfig2
-rw-r--r--drivers/usb/Kconfig1
-rw-r--r--drivers/video/Kconfig2
9 files changed, 15 insertions, 13 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 8cc312b5d4dc..e6af7dd01fe6 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -6,6 +6,7 @@ mainmenu "Linux/Microblaze Kernel Configuration"
6config MICROBLAZE 6config MICROBLAZE
7 def_bool y 7 def_bool y
8 select HAVE_LMB 8 select HAVE_LMB
9 select ARCH_WANT_OPTIONAL_GPIOLIB
9 10
10config SWAP 11config SWAP
11 def_bool n 12 def_bool n
@@ -49,6 +50,9 @@ config GENERIC_CLOCKEVENTS
49config GENERIC_HARDIRQS_NO__DO_IRQ 50config GENERIC_HARDIRQS_NO__DO_IRQ
50 def_bool y 51 def_bool y
51 52
53config GENERIC_GPIO
54 def_bool y
55
52config PCI 56config PCI
53 depends on !MMU 57 depends on !MMU
54 def_bool n 58 def_bool n
@@ -105,9 +109,6 @@ config CMDLINE_FORCE
105config OF 109config OF
106 def_bool y 110 def_bool y
107 111
108config OF_DEVICE
109 def_bool y
110
111config PROC_DEVICETREE 112config PROC_DEVICETREE
112 bool "Support for device tree in /proc" 113 bool "Support for device tree in /proc"
113 depends on PROC_FS 114 depends on PROC_FS
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ddea8e485cc9..9f1665fc0f66 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -438,7 +438,7 @@ source "drivers/s390/block/Kconfig"
438 438
439config XILINX_SYSACE 439config XILINX_SYSACE
440 tristate "Xilinx SystemACE support" 440 tristate "Xilinx SystemACE support"
441 depends on 4xx 441 depends on 4xx || MICROBLAZE
442 help 442 help
443 Include support for the Xilinx SystemACE CompactFlash interface 443 Include support for the Xilinx SystemACE CompactFlash interface
444 444
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 735bbe2be51a..bb1a071b8038 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -893,7 +893,7 @@ config DTLK
893 893
894config XILINX_HWICAP 894config XILINX_HWICAP
895 tristate "Xilinx HWICAP Support" 895 tristate "Xilinx HWICAP Support"
896 depends on XILINX_VIRTEX 896 depends on XILINX_VIRTEX || MICROBLAZE
897 help 897 help
898 This option enables support for Xilinx Internal Configuration 898 This option enables support for Xilinx Internal Configuration
899 Access Port (ICAP) driver. The ICAP is used on Xilinx Virtex 899 Access Port (ICAP) driver. The ICAP is used on Xilinx Virtex
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index edb02530e461..11f373971fa5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -69,7 +69,7 @@ comment "Memory mapped GPIO expanders:"
69 69
70config GPIO_XILINX 70config GPIO_XILINX
71 bool "Xilinx GPIO support" 71 bool "Xilinx GPIO support"
72 depends on PPC_OF 72 depends on PPC_OF || MICROBLAZE
73 help 73 help
74 Say yes here to support the Xilinx FPGA GPIO device 74 Say yes here to support the Xilinx FPGA GPIO device
75 75
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index da3c3a5d2689..c4b3fbd1a80f 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -192,7 +192,7 @@ config SERIO_RAW
192 192
193config SERIO_XILINX_XPS_PS2 193config SERIO_XILINX_XPS_PS2
194 tristate "Xilinx XPS PS/2 Controller Support" 194 tristate "Xilinx XPS PS/2 Controller Support"
195 depends on PPC 195 depends on PPC || MICROBLAZE
196 help 196 help
197 This driver supports XPS PS/2 IP from the Xilinx EDK on 197 This driver supports XPS PS/2 IP from the Xilinx EDK on
198 PowerPC platform. 198 PowerPC platform.
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index f821dbc952a4..27f3b81333de 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -1,21 +1,21 @@
1config OF_DEVICE 1config OF_DEVICE
2 def_bool y 2 def_bool y
3 depends on OF && (SPARC || PPC_OF) 3 depends on OF && (SPARC || PPC_OF || MICROBLAZE)
4 4
5config OF_GPIO 5config OF_GPIO
6 def_bool y 6 def_bool y
7 depends on OF && PPC_OF && GPIOLIB 7 depends on OF && (PPC_OF || MICROBLAZE) && GPIOLIB
8 help 8 help
9 OpenFirmware GPIO accessors 9 OpenFirmware GPIO accessors
10 10
11config OF_I2C 11config OF_I2C
12 def_tristate I2C 12 def_tristate I2C
13 depends on PPC_OF && I2C 13 depends on (PPC_OF || MICROBLAZE) && I2C
14 help 14 help
15 OpenFirmware I2C accessors 15 OpenFirmware I2C accessors
16 16
17config OF_SPI 17config OF_SPI
18 def_tristate SPI 18 def_tristate SPI
19 depends on OF && PPC_OF && SPI 19 depends on OF && (PPC_OF || MICROBLAZE) && SPI
20 help 20 help
21 OpenFirmware SPI accessors 21 OpenFirmware SPI accessors
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 83a185d52961..957494775413 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -212,7 +212,7 @@ config SPI_TXX9
212 212
213config SPI_XILINX 213config SPI_XILINX
214 tristate "Xilinx SPI controller" 214 tristate "Xilinx SPI controller"
215 depends on XILINX_VIRTEX && EXPERIMENTAL 215 depends on (XILINX_VIRTEX || MICROBLAZE) && EXPERIMENTAL
216 select SPI_BITBANG 216 select SPI_BITBANG
217 help 217 help
218 This exposes the SPI controller IP from the Xilinx EDK. 218 This exposes the SPI controller IP from the Xilinx EDK.
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index c6c816b7ecb5..5eee3f82be5d 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -22,6 +22,7 @@ config USB_ARCH_HAS_HCD
22 default y if PCMCIA && !M32R # sl811_cs 22 default y if PCMCIA && !M32R # sl811_cs
23 default y if ARM # SL-811 23 default y if ARM # SL-811
24 default y if SUPERH # r8a66597-hcd 24 default y if SUPERH # r8a66597-hcd
25 default y if MICROBLAZE
25 default PCI 26 default PCI
26 27
27# many non-PCI SOC chips embed OHCI 28# many non-PCI SOC chips embed OHCI
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 0048f1185a60..74712cb8399a 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1996,7 +1996,7 @@ config FB_PS3_DEFAULT_SIZE_M
1996 1996
1997config FB_XILINX 1997config FB_XILINX
1998 tristate "Xilinx frame buffer support" 1998 tristate "Xilinx frame buffer support"
1999 depends on FB && XILINX_VIRTEX 1999 depends on FB && (XILINX_VIRTEX || MICROBLAZE)
2000 select FB_CFB_FILLRECT 2000 select FB_CFB_FILLRECT
2001 select FB_CFB_COPYAREA 2001 select FB_CFB_COPYAREA
2002 select FB_CFB_IMAGEBLIT 2002 select FB_CFB_IMAGEBLIT