cris: Switch cris to drivers/Kconfig
Subsystems (3)
PATCH 1/4 cris: Switch cris to drivers/Kconfig
allmodconfig:
drivers/video/console/fonts.c:71:2: error: #error No fonts configured.
This is caused by cris not using the generic drivers/Kconfig, and thus not traversing drivers/video/console/Kconfig.
As the build system does traverse drivers/video/console/Makefile, fonts.c was compiled with an inconsistent configuration.
Signed-off-by Geert Uytterhoeven <[email protected]>
--- arch/cris/Kconfig | 32 +------------------------------- arch/cris/arch-v32/drivers/Kconfig | 7 ------- 2 files changed, 1 insertions(+), 38 deletions(-)
arch/cris/Kconfig +1 -31
@@ -637,40 +637,10 @@ endchoice endmenu -source "drivers/base/Kconfig" - -# standard linux drivers -source "drivers/mtd/Kconfig" - -source "drivers/parport/Kconfig" - -source "drivers/pnp/Kconfig" - -source "drivers/block/Kconfig" - -source "drivers/ide/Kconfig" - -source "drivers/net/Kconfig" - -source "drivers/i2c/Kconfig" - -source "drivers/rtc/Kconfig" - -# -# input before char - char/joystick depends on it. As does USB. -# -source "drivers/input/Kconfig" - -source "drivers/char/Kconfig" +source "drivers/Kconfig" source "fs/Kconfig" -source "drivers/usb/Kconfig" - -source "drivers/uwb/Kconfig" - -source "drivers/staging/Kconfig" - source "arch/cris/Kconfig.debug" source "security/Kconfig"
arch/cris/arch-v32/drivers/Kconfig +0 -7
@@ -641,8 +641,6 @@ config ETRAX_STREAMCOPROC This option enables a driver for the stream co-processor for cryptographic operations. -source drivers/mmc/Kconfig - config ETRAX_MMC_IOP tristate "MMC/SD host driver using IO-processor" depends on ETRAX_ARCH_V32 && MMC
@@ -834,9 +832,4 @@ config ETRAX_SPI_MMC_WP_GPIO_PIN The pin to use for the SD/MMC write-protect signal for a memory card. If defined as " " (space), the card is considered writable. -# Avoid choices causing non-working configs by conditionalizing the inclusion. -if ETRAX_SPI_MMC -source drivers/spi/Kconfig -endif - endif
Signature · 1 line
1.7.0.4
PATCH 2/4 console: Disable VGA text console support on cris
Signed-off-by Geert Uytterhoeven <[email protected]>
--- drivers/video/console/Kconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/video/console/Kconfig +3 -1
@@ -6,7 +6,9 @@ menu "Console display driver support" config VGA_CONSOLE bool "VGA text console" if EXPERT || !X86 - depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) + depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \ + !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ + (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) default y help Saying Y here will allow you to use Linux in text mode through a
Signature · 1 line
1.7.0.4
PATCH 3/4 parport: disable PC-style parallel port support on cris
In reply to Geert UytterhoevenSigned-off-by Geert Uytterhoeven <[email protected]>
--- drivers/parport/Kconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/parport/Kconfig +3 -1
@@ -36,7 +36,9 @@ if PARPORT config PARPORT_PC tristate "PC-style hardware" depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \ - (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && !XTENSA + (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \ + !XTENSA && !CRIS + ---help--- You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-style
Signature · 1 line
1.7.0.4
PATCH 4/4 cris: Wire up asm-generic/vga.h
In reply to Geert UytterhoevenWhen compiling several DRM related files:
include/video/vga.h:22:21: fatal error: asm/vga.h: No such file or directory
Signed-off-by Geert Uytterhoeven <[email protected]>
--- arch/cris/include/asm/Kbuild | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/cris/include/asm/Kbuild +1 -0
@@ -9,4 +9,5 @@ generic-y += kvm_para.h generic-y += linkage.h generic-y += module.h generic-y += trace_clock.h +generic-y += vga.h generic-y += xor.h
Signature · 1 line
1.7.0.4