[GITLAB] - A technical upgrade is planned on Thursday the 1st of July at noon on our GITLAB server.

Commit dfd5e688 authored by Mauro Ribeiro's avatar Mauro Ribeiro

adjust backports config symbols we port

Change-Id: Ib4cb27fd6dc9863c8de614dbeea4b3df30659308
parent 6024d985
......@@ -29,7 +29,7 @@
# default m if BPAUTO_FOO
#
# # or for build-testing (BPAUTO_USERSEL_BUILD_ALL is enabled)
# default m if BPAUTO_USERSEL_BUILD_ALL
# default m if BACKPORT_BPAUTO_USERSEL_BUILD_ALL
#
# config BPAUTO_FOO
# bool
......@@ -53,33 +53,39 @@
# Variations are obviously possible.
#
config BPAUTO_BUILD_CORDIC
config BACKPORT_BPAUTO_BUILD_CORDIC
tristate
depends on !BPAUTO_BUILD_CORDIC
depends on !CORDIC
default m if BPAUTO_CORDIC
default m if BPAUTO_USERSEL_BUILD_ALL
default m if BACKPORT_BPAUTO_CORDIC
default m if BACKPORT_BPAUTO_USERSEL_BUILD_ALL
#module-name cordic
#c-file lib/cordic.c
config BPAUTO_CORDIC
config BACKPORT_BPAUTO_CORDIC
bool
depends on !BPAUTO_CORDIC
config BPAUTO_BUILD_AVERAGE
config BACKPORT_BPAUTO_BUILD_AVERAGE
bool
depends on !BPAUTO_BUILD_AVERAGE
depends on !AVERAGE
default y if BPAUTO_USERSEL_BUILD_ALL
default y if BPAUTO_AVERAGE
default y if BACKPORT_BPAUTO_USERSEL_BUILD_ALL
default y if BACKPORT_BPAUTO_AVERAGE
#h-file linux/average.h
#c-file lib/average.c
config BPAUTO_AVERAGE
config BACKPORT_BPAUTO_AVERAGE
bool
depends on !BPAUTO_AVERAGE
config BPAUTO_MII
config BACKPORT_BPAUTO_MII
bool
depends on !BPAUTO_MII
config BPAUTO_BUILD_DMA_SHARED_HELPERS
config BACKPORT_BPAUTO_BUILD_DMA_SHARED_HELPERS
bool
depends on !BPAUTO_BUILD_DMA_SHARED_HELPERS
depends on HAS_DMA
# Build on other kernels kernels < 3.9 if HAVE_GENERIC_DMA_COHERENT is
# not set. Kernels >= 3.8 have this if HAS_DMA is set.
......@@ -87,26 +93,31 @@ config BPAUTO_BUILD_DMA_SHARED_HELPERS
# Always build if on 3.3 - 3.5
default y if (KERNEL_3_4 || KERNEL_3_5 || KERNEL_3_6)
# build for testing
default y if BPAUTO_USERSEL_BUILD_ALL
default y if BACKPORT_BPAUTO_USERSEL_BUILD_ALL
config BPAUTO_BUILD_LEDS
config BACKPORT_BPAUTO_BUILD_LEDS
bool
depends on !BPAUTO_BUILD_LEDS
depends on !NEW_LEDS || LEDS_CLASS=n || !LEDS_TRIGGERS
default y if BPAUTO_NEW_LEDS
default y if BPAUTO_LEDS_CLASS
default y if BPAUTO_LEDS_TRIGGERS
default y if BACKPORT_BPAUTO_NEW_LEDS
default y if BACKPORT_BPAUTO_LEDS_CLASS
default y if BACKPORT_BPAUTO_LEDS_TRIGGERS
config BPAUTO_NEW_LEDS
config BACKPORT_BPAUTO_NEW_LEDS
bool
depends on !BPAUTO_NEW_LEDS
config BPAUTO_LEDS_CLASS
config BACKPORT_BPAUTO_LEDS_CLASS
bool
depends on !BPAUTO_LEDS_CLASS
config BPAUTO_LEDS_TRIGGERS
config BACKPORT_BPAUTO_LEDS_TRIGGERS
bool
depends on !BPAUTO_LEDS_TRIGGERS
config BPAUTO_USERSEL_BUILD_ALL
config BACKPORT_BPAUTO_USERSEL_BUILD_ALL
bool "Build all compat code"
depends on !BPAUTO_USERSEL_BUILD_ALL
help
This option selects all the compat code options
that would otherwise only be selected by drivers.
......@@ -114,24 +125,28 @@ config BPAUTO_USERSEL_BUILD_ALL
It's only really useful for compat testing, so
you probably shouldn't enable it.
config BPAUTO_CRYPTO_CCM
config BACKPORT_BPAUTO_CRYPTO_CCM
depends on CRYPTO_AEAD
depends on !BPAUTO_CRYPTO_CCM
depends on CRYPTO_CTR
bool
config BPAUTO_BUILD_CRYPTO_CCM
config BACKPORT_BPAUTO_BUILD_CRYPTO_CCM
bool
depends on !BPAUTO_BUILD_CRYPTO_CCM
default n if CRYPTO_CCM
default y if BPAUTO_CRYPTO_CCM
default y if BACKPORT_BPAUTO_CRYPTO_CCM
#c-file crypto/ccm.c
config BPAUTO_WANT_DEV_COREDUMP
config BACKPORT_BPAUTO_WANT_DEV_COREDUMP
bool
depends on !BPAUTO_WANT_DEV_COREDUMP
config BPAUTO_BUILD_WANT_DEV_COREDUMP
config BACKPORT_BPAUTO_BUILD_WANT_DEV_COREDUMP
bool
depends on !BPAUTO_BUILD_WANT_DEV_COREDUMP
default n if DEV_COREDUMP
default n if DISABLE_DEV_COREDUMP
default y if BPAUTO_WANT_DEV_COREDUMP
default y if BACKPORT_BPAUTO_WANT_DEV_COREDUMP
#h-file linux/devcoredump.h
#c-file drivers/base/devcoredump.c
config BCMA_POSSIBLE
config BACKPORT_BCMA_POSSIBLE
bool
depends on !BCMA_POSSIBLE
depends on HAS_IOMEM && HAS_DMA
default y
menu "Broadcom specific AMBA"
depends on BCMA_POSSIBLE
depends on BACKPORT_BCMA_POSSIBLE
config BCMA
config BACKPORT_BCMA
tristate "BCMA support"
depends on BCMA_POSSIBLE
depends on !BCMA
depends on BACKPORT_BCMA_POSSIBLE
help
Bus driver for Broadcom specific Advanced Microcontroller Bus
Architecture.
# Support for Block-I/O. SELECT this from the driver that needs it.
config BCMA_BLOCKIO
config BACKPORT_BCMA_BLOCKIO
bool
depends on BCMA
depends on !BCMA_BLOCKIO
depends on BACKPORT_BCMA
config BCMA_HOST_PCI_POSSIBLE
config BACKPORT_BCMA_HOST_PCI_POSSIBLE
bool
depends on BCMA && PCI = y
depends on !BCMA_HOST_PCI_POSSIBLE
depends on BACKPORT_BCMA && PCI = y
default y
config BCMA_HOST_PCI
config BACKPORT_BCMA_HOST_PCI
bool "Support for BCMA on PCI-host bus"
depends on BCMA_HOST_PCI_POSSIBLE
depends on !BCMA_HOST_PCI
depends on BACKPORT_BCMA_HOST_PCI_POSSIBLE
default y
config BCMA_DRIVER_PCI_HOSTMODE
config BACKPORT_BCMA_DRIVER_PCI_HOSTMODE
bool "Driver for PCI core working in hostmode"
depends on BCMA && MIPS && BCMA_HOST_PCI
depends on !BCMA_DRIVER_PCI_HOSTMODE
depends on BACKPORT_BCMA && MIPS && BACKPORT_BCMA_HOST_PCI
help
PCI core hostmode operation (external PCI bus).
config BCMA_HOST_SOC
config BACKPORT_BCMA_HOST_SOC
bool "Support for BCMA in a SoC"
depends on BCMA
depends on !BCMA_HOST_SOC
depends on BACKPORT_BCMA
help
Host interface for a Broadcom AIX bus directly mapped into
the memory. This only works with the Broadcom SoCs from the
......@@ -44,46 +51,52 @@ config BCMA_HOST_SOC
If unsure, say N
config BCMA_DRIVER_MIPS
config BACKPORT_BCMA_DRIVER_MIPS
bool "BCMA Broadcom MIPS core driver"
depends on BCMA && MIPS
depends on !BCMA_DRIVER_MIPS
depends on BACKPORT_BCMA && MIPS
help
Driver for the Broadcom MIPS core attached to Broadcom specific
Advanced Microcontroller Bus.
If unsure, say N
config BCMA_SFLASH
config BACKPORT_BCMA_SFLASH
bool
depends on BCMA_DRIVER_MIPS
depends on !BCMA_SFLASH
depends on BACKPORT_BCMA_DRIVER_MIPS
default y
config BCMA_NFLASH
config BACKPORT_BCMA_NFLASH
bool
depends on BCMA_DRIVER_MIPS
depends on !BCMA_NFLASH
depends on BACKPORT_BCMA_DRIVER_MIPS
default y
config BCMA_DRIVER_GMAC_CMN
config BACKPORT_BCMA_DRIVER_GMAC_CMN
bool "BCMA Broadcom GBIT MAC COMMON core driver"
depends on BCMA
depends on !BCMA_DRIVER_GMAC_CMN
depends on BACKPORT_BCMA
help
Driver for the Broadcom GBIT MAC COMMON core attached to Broadcom
specific Advanced Microcontroller Bus.
If unsure, say N
config BCMA_DRIVER_GPIO
config BACKPORT_BCMA_DRIVER_GPIO
bool "BCMA GPIO driver"
depends on BCMA && GPIOLIB
select IRQ_DOMAIN if BCMA_HOST_SOC
depends on !BCMA_DRIVER_GPIO
depends on BACKPORT_BCMA && GPIOLIB
select IRQ_DOMAIN if BACKPORT_BCMA_HOST_SOC
help
Driver to provide access to the GPIO pins of the bcma bus.
If unsure, say N
config BCMA_DEBUG
config BACKPORT_BCMA_DEBUG
bool "BCMA debugging"
depends on BCMA
depends on !BCMA_DEBUG
depends on BACKPORT_BCMA
help
This turns on additional debugging messages.
......
menu "Bluetooth device drivers"
depends on BT
depends on BACKPORT_BT
config BT_HCIBTUSB
config BACKPORT_BT_HCIBTUSB
tristate "HCI USB driver"
depends on !BT_HCIBTUSB
depends on USB
help
Bluetooth HCI USB driver.
......@@ -13,8 +14,9 @@ config BT_HCIBTUSB
Say Y here to compile support for Bluetooth USB devices into the
kernel or say M to compile it as module (btusb).
config BT_HCIBTSDIO
config BACKPORT_BT_HCIBTSDIO
tristate "HCI SDIO driver"
depends on !BT_HCIBTSDIO
depends on MMC
help
Bluetooth HCI SDIO driver.
......@@ -24,8 +26,9 @@ config BT_HCIBTSDIO
Say Y here to compile support for Bluetooth SDIO devices into the
kernel or say M to compile it as module (btsdio).
config BT_HCIUART
config BACKPORT_BT_HCIUART
tristate "HCI UART driver"
depends on !BT_HCIUART
depends on TTY
help
Bluetooth HCI UART driver.
......@@ -37,9 +40,10 @@ config BT_HCIUART
Say Y here to compile support for Bluetooth UART devices into the
kernel or say M to compile it as module (hci_uart).
config BT_HCIUART_H4
config BACKPORT_BT_HCIUART_H4
bool "UART (H4) protocol support"
depends on BT_HCIUART
depends on !BT_HCIUART_H4
depends on BACKPORT_BT_HCIUART
help
UART (H4) is serial protocol for communication between Bluetooth
device and host. This protocol is required for most Bluetooth devices
......@@ -47,9 +51,10 @@ config BT_HCIUART_H4
Say Y here to compile support for HCI UART (H4) protocol.
config BT_HCIUART_BCSP
config BACKPORT_BT_HCIUART_BCSP
bool "BCSP protocol support"
depends on BT_HCIUART
depends on !BT_HCIUART_BCSP
depends on BACKPORT_BT_HCIUART
select BITREVERSE
help
BCSP (BlueCore Serial Protocol) is serial protocol for communication
......@@ -59,9 +64,10 @@ config BT_HCIUART_BCSP
Say Y here to compile support for HCI BCSP protocol.
config BT_HCIUART_ATH3K
config BACKPORT_BT_HCIUART_ATH3K
bool "Atheros AR300x serial support"
depends on BT_HCIUART
depends on !BT_HCIUART_ATH3K
depends on BACKPORT_BT_HCIUART
help
HCIATH3K (HCI Atheros AR300x) is a serial protocol for
communication between host and Atheros AR300x Bluetooth devices.
......@@ -71,9 +77,10 @@ config BT_HCIUART_ATH3K
Say Y here to compile support for HCI UART ATH3K protocol.
config BT_HCIUART_LL
config BACKPORT_BT_HCIUART_LL
bool "HCILL protocol support"
depends on BT_HCIUART
depends on !BT_HCIUART_LL
depends on BACKPORT_BT_HCIUART
help
HCILL (HCI Low Level) is a serial protocol for communication
between Bluetooth device and host. This protocol is required for
......@@ -82,9 +89,10 @@ config BT_HCIUART_LL
Say Y here to compile support for HCILL protocol.
config BT_HCIUART_3WIRE
config BACKPORT_BT_HCIUART_3WIRE
bool "Three-wire UART (H5) protocol support"
depends on BT_HCIUART
depends on !BT_HCIUART_3WIRE
depends on BACKPORT_BT_HCIUART
help
The HCI Three-wire UART Transport Layer makes it possible to
user the Bluetooth HCI over a serial port interface. The HCI
......@@ -94,8 +102,9 @@ config BT_HCIUART_3WIRE
Say Y here to compile support for Three-wire UART protocol.
config BT_HCIBCM203X
config BACKPORT_BT_HCIBCM203X
tristate "HCI BCM203x USB driver"
depends on !BT_HCIBCM203X
depends on USB
select FW_LOADER
help
......@@ -106,8 +115,9 @@ config BT_HCIBCM203X
Say Y here to compile support for HCI BCM203x devices into the
kernel or say M to compile it as module (bcm203x).
config BT_HCIBPA10X
config BACKPORT_BT_HCIBPA10X
tristate "HCI BPA10x USB driver"
depends on !BT_HCIBPA10X
depends on USB
help
Bluetooth HCI BPA10x USB driver.
......@@ -117,8 +127,9 @@ config BT_HCIBPA10X
Say Y here to compile support for HCI BPA10x devices into the
kernel or say M to compile it as module (bpa10x).
config BT_HCIBFUSB
config BACKPORT_BT_HCIBFUSB
tristate "HCI BlueFRITZ! USB driver"
depends on !BT_HCIBFUSB
depends on USB
select FW_LOADER
help
......@@ -130,8 +141,9 @@ config BT_HCIBFUSB
Say Y here to compile support for HCI BFUSB devices into the
kernel or say M to compile it as module (bfusb).
config BT_HCIDTL1
config BACKPORT_BT_HCIDTL1
tristate "HCI DTL1 (PC Card) driver"
depends on !BT_HCIDTL1
depends on PCMCIA
help
Bluetooth HCI DTL1 (PC Card) driver.
......@@ -143,22 +155,24 @@ config BT_HCIDTL1
Say Y here to compile support for HCI DTL1 devices into the
kernel or say M to compile it as module (dtl1_cs).
config BT_HCIBT3C
config BACKPORT_BT_HCIBT3C
tristate "HCI BT3C (PC Card) driver"
depends on !BT_HCIBT3C
depends on PCMCIA
select FW_LOADER
help
Bluetooth HCI BT3C (PC Card) driver.
Bluetooth HCI BACKPORT_BT3C (PC Card) driver.
This driver provides support for Bluetooth PCMCIA devices with
3Com BT3C interface:
3Com BACKPORT_BT3C interface:
3Com Bluetooth Card (3CRWB6096)
HP Bluetooth Card
Say Y here to compile support for HCI BT3C devices into the
Say Y here to compile support for HCI BACKPORT_BT3C devices into the
kernel or say M to compile it as module (bt3c_cs).
config BT_HCIBLUECARD
config BACKPORT_BT_HCIBLUECARD
tristate "HCI BlueCard (PC Card) driver"
depends on !BT_HCIBLUECARD
depends on PCMCIA
help
Bluetooth HCI BlueCard (PC Card) driver.
......@@ -170,8 +184,9 @@ config BT_HCIBLUECARD
Say Y here to compile support for HCI BlueCard devices into the
kernel or say M to compile it as module (bluecard_cs).
config BT_HCIBTUART
config BACKPORT_BT_HCIBTUART
tristate "HCI UART (PC Card) device driver"
depends on !BT_HCIBTUART
depends on PCMCIA
help
Bluetooth HCI UART (PC Card) driver.
......@@ -186,8 +201,9 @@ config BT_HCIBTUART
Say Y here to compile support for HCI UART devices into the
kernel or say M to compile it as module (btuart_cs).
config BT_HCIVHCI
config BACKPORT_BT_HCIVHCI
tristate "HCI VHCI (Virtual HCI device) driver"
depends on !BT_HCIVHCI
help
Bluetooth Virtual HCI device driver.
This driver is required if you want to use HCI Emulation software.
......@@ -195,8 +211,9 @@ config BT_HCIVHCI
Say Y here to compile support for virtual HCI devices into the
kernel or say M to compile it as module (hci_vhci).
config BT_MRVL
config BACKPORT_BT_MRVL
tristate "Marvell Bluetooth driver support"
depends on !BT_MRVL
help
The core driver to support Marvell Bluetooth devices.
......@@ -206,9 +223,10 @@ config BT_MRVL
Say Y here to compile Marvell Bluetooth driver
into the kernel or say M to compile it as module.
config BT_MRVL_SDIO
config BACKPORT_BT_MRVL_SDIO
tristate "Marvell BT-over-SDIO driver"
depends on BT_MRVL && MMC
depends on !BT_MRVL_SDIO
depends on BACKPORT_BT_MRVL && MMC
select FW_LOADER
select WANT_DEV_COREDUMP
help
......@@ -218,12 +236,13 @@ config BT_MRVL_SDIO
devices with SDIO interface. Currently SD8688/SD8787/SD8797/SD8887/SD8897
chipsets are supported.
Say Y here to compile support for Marvell BT-over-SDIO driver
Say Y here to compile support for Marvell BACKPORT_BT-over-SDIO driver
into the kernel or say M to compile it as module.
config BT_ATH3K
config BACKPORT_BT_ATH3K
tristate "Atheros firmware download driver"
depends on BT_HCIBTUSB
depends on !BT_ATH3K
depends on BACKPORT_BT_HCIBTUSB
select FW_LOADER
help
Bluetooth firmware download driver.
......@@ -233,13 +252,14 @@ config BT_ATH3K
Say Y here to compile support for "Atheros firmware download driver"
into the kernel or say M to compile it as module (ath3k).
config BT_WILINK
config BACKPORT_BT_WILINK
tristate "Texas Instruments WiLink7 driver"
depends on !BT_WILINK
depends on TI_ST
help
This enables the Bluetooth driver for Texas Instrument's BT/FM/GPS
This enables the Bluetooth driver for Texas Instrument's BACKPORT_BT/FM/GPS
combo devices. This makes use of shared transport line discipline
core driver to communicate with the BT core of the combo chip.
core driver to communicate with the BACKPORT_BT core of the combo chip.
Say Y here to compile support for Texas Instrument's WiLink7 driver
into the kernel or say M to compile it as module (btwilink).
......
......@@ -2,8 +2,9 @@
# Multimedia device configuration
#
menuconfig MEDIA_SUPPORT
menuconfig BACKPORT_MEDIA_SUPPORT
tristate "Multimedia support"
depends on !MEDIA_SUPPORT
depends on HAS_IOMEM
help
If you want to use Webcams, Video grabber devices and/or TV devices
......@@ -11,22 +12,24 @@ menuconfig MEDIA_SUPPORT
Additional info and docs are available on the web at
<http://linuxtv.org>
if MEDIA_SUPPORT
if BACKPORT_MEDIA_SUPPORT
comment "Multimedia core support"
#
# Multimedia support - automatically enable V4L2 and DVB core
#
config MEDIA_CAMERA_SUPPORT
config BACKPORT_MEDIA_CAMERA_SUPPORT
bool "Cameras/video grabbers support"
depends on !MEDIA_CAMERA_SUPPORT
---help---
Enable support for webcams and video grabbers.
Say Y when you have a webcam or a video capture grabber board.
config MEDIA_ANALOG_TV_SUPPORT
config BACKPORT_MEDIA_ANALOG_TV_SUPPORT
bool "Analog TV support"
depends on !MEDIA_ANALOG_TV_SUPPORT
---help---
Enable analog TV support.
......@@ -37,16 +40,18 @@ config MEDIA_ANALOG_TV_SUPPORT
support both analog and digital TV. Disabling this option
will disable support for them.
config MEDIA_DIGITAL_TV_SUPPORT
config BACKPORT_MEDIA_DIGITAL_TV_SUPPORT
bool "Digital TV support"
depends on !MEDIA_DIGITAL_TV_SUPPORT
---help---
Enable digital TV support.
Say Y when you have a board with digital support or a board with
hybrid digital TV and analog TV.
config MEDIA_RADIO_SUPPORT
config BACKPORT_MEDIA_RADIO_SUPPORT
bool "AM/FM radio receivers/transmitters support"
depends on !MEDIA_RADIO_SUPPORT
---help---
Enable AM/FM radio support.
......@@ -59,15 +64,17 @@ config MEDIA_RADIO_SUPPORT
support radio reception. Disabling this option will
disable support for them.
config MEDIA_SDR_SUPPORT
config BACKPORT_MEDIA_SDR_SUPPORT
bool "Software defined radio support"
depends on !MEDIA_SDR_SUPPORT
---help---
Enable software defined radio support.
Say Y when you have a software defined radio device.
config MEDIA_RC_SUPPORT
config BACKPORT_MEDIA_RC_SUPPORT
bool "Remote Controller support"
depends on !MEDIA_RC_SUPPORT
depends on INPUT
---help---
Enable support for Remote Controllers on Linux. This is
......@@ -85,9 +92,10 @@ config MEDIA_RC_SUPPORT
# Selectable only for webcam/grabbers, as other drivers don't use it
#
config MEDIA_CONTROLLER
config BACKPORT_MEDIA_CONTROLLER
bool "Media Controller API"
depends on MEDIA_CAMERA_SUPPORT