Skip to content

Commit 8700a0d

Browse files
notropopcornmix
notro
authored and
popcornmix
committed
kconfig: Just use ARCH_BCM2835 for depends on
ARCH_BCM2708 and ARCH_BCM2709 selects ARCH_BCM2835 now, so the dependencies can be simplified. Signed-off-by: Noralf Trønnes <[email protected]>
1 parent 641b540 commit 8700a0d

File tree

19 files changed

+25
-28
lines changed

19 files changed

+25
-28
lines changed

‎arch/arm/Kconfig.debug

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ choice
147147

148148
config DEBUG_BCM2835
149149
bool "Kernel low-level debugging on BCM2835 PL011 UART"
150-
depends on (ARCH_BCM2835 && ARCH_MULTI_V6) || ARCH_BCM2708
150+
depends on ARCH_BCM2835 && ARCH_MULTI_V6
151151
select DEBUG_UART_PL01X
152152

153153
config DEBUG_BCM2836
154154
bool "Kernel low-level debugging on BCM2836 PL011 UART"
155-
depends on (ARCH_BCM2835 && ARCH_MULTI_V7) || ARCH_BCM2709
155+
depends on ARCH_BCM2835 && ARCH_MULTI_V7
156156
select DEBUG_UART_PL01X
157157

158158
config DEBUG_BCM_5301X
@@ -1695,8 +1695,7 @@ config DEBUG_UART_8250_FLOW_CONTROL
16951695

16961696
config DEBUG_UNCOMPRESS
16971697
bool
1698-
depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
1699-
ARCH_BCM2708 || ARCH_BCM2709
1698+
depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
17001699
default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
17011700
(!DEBUG_TEGRA_UART || !ZBOOT_ROM)
17021701
help
@@ -1713,8 +1712,7 @@ config DEBUG_UNCOMPRESS
17131712
config UNCOMPRESS_INCLUDE
17141713
string
17151714
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
1716-
PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \
1717-
ARCH_BCM2708 || ARCH_BCM2709
1715+
PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
17181716
default "mach/uncompress.h"
17191717

17201718
config EARLY_PRINTK

‎drivers/char/broadcom/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ config BCM2835_DEVGPIOMEM
4949

5050
config BCM2835_SMI_DEV
5151
tristate "Character device driver for BCM2835 Secondary Memory Interface"
52-
depends on (MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835) && BCM2835_SMI
52+
depends on BCM2835_SMI
5353
default m
5454
help
5555
This driver provides a character device interface (ioctl + read/write) to

‎drivers/char/hw_random/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ config HW_RANDOM_BCM63XX
9090

9191
config HW_RANDOM_BCM2835
9292
tristate "Broadcom BCM2835 Random Number Generator support"
93-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || ARCH_BCM_NSP || ARCH_BCM_5301X
93+
depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X
9494
default HW_RANDOM
9595
---help---
9696
This driver provides kernel-side support for the Random Number

‎drivers/dma/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ config COH901318
108108

109109
config DMA_BCM2835
110110
tristate "BCM2835 DMA engine support"
111-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
111+
depends on ARCH_BCM2835
112112
select DMA_ENGINE
113113
select DMA_VIRTUAL_CHANNELS
114114

‎drivers/gpio/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ config GPIO_BCM_KONA
146146

147147
config GPIO_BCM_VIRT
148148
bool "Broadcom Virt GPIO"
149-
depends on OF_GPIO && RASPBERRYPI_FIRMWARE && (ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || COMPILE_TEST)
149+
depends on OF_GPIO && RASPBERRYPI_FIRMWARE && (ARCH_BCM2835 || COMPILE_TEST)
150150
help
151151
Turn on virtual GPIO support for Broadcom BCM283X chips.
152152

‎drivers/gpu/drm/vc4/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config DRM_VC4
22
tristate "Broadcom VC4 Graphics"
3-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || COMPILE_TEST
3+
depends on ARCH_BCM2835 || COMPILE_TEST
44
depends on DRM
55
select DRM_KMS_HELPER
66
select DRM_KMS_CMA_HELPER

‎drivers/i2c/busses/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ comment "PC SMBus host controller drivers"
1010

1111
config I2C_BCM2708
1212
tristate "BCM2708 BSC"
13-
depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835
13+
depends on ARCH_BCM2835
1414
help
1515
Enabling this option will add BSC (Broadcom Serial Controller)
1616
support for the BCM2708. BSC is a Broadcom proprietary bus compatible
@@ -385,7 +385,7 @@ config I2C_AXXIA
385385

386386
config I2C_BCM2835
387387
tristate "Broadcom BCM2835 I2C controller"
388-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
388+
depends on ARCH_BCM2835
389389
help
390390
If you say yes to this option, support will be included for the
391391
BCM2835 I2C controller.

‎drivers/mailbox/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ config ALTERA_MBOX
7474

7575
config BCM2835_MBOX
7676
tristate "BCM2835 Mailbox"
77-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
77+
depends on ARCH_BCM2835
7878
help
7979
An implementation of the BCM2385 Mailbox. It is used to invoke
8080
the services of the Videocore. Say Y here if you want to use the

‎drivers/media/platform/bcm2835/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
config VIDEO_BCM2835
44
bool "Broadcom BCM2835 camera interface driver"
5-
depends on VIDEO_V4L2 && (ARCH_BCM2708 || ARCH_BCM2709 || ARCH_BCM2835)
5+
depends on VIDEO_V4L2 && ARCH_BCM2835
66
---help---
77
Say Y here to enable camera host interface devices for
88
Broadcom BCM2835 SoC. This operates over the VCHIQ interface

‎drivers/misc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config SENSORS_LIS3LV02D
1212

1313
config BCM2835_SMI
1414
tristate "Broadcom 283x Secondary Memory Interface driver"
15-
depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835
15+
depends on ARCH_BCM2835
1616
default m
1717
help
1818
Driver for enabling and using Broadcom's Secondary/Slow Memory Interface.

‎drivers/mmc/host/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ comment "MMC/SD/SDIO Host Controller Drivers"
66

77
config MMC_BCM2835
88
tristate "MMC support on BCM2835"
9-
depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835
9+
depends on ARCH_BCM2835
1010
help
1111
This selects the MMC Interface on BCM2835.
1212

@@ -35,7 +35,7 @@ config MMC_BCM2835_PIO_DMA_BARRIER
3535

3636
config MMC_BCM2835_SDHOST
3737
tristate "Support for the SDHost controller on BCM2708/9"
38-
depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835
38+
depends on ARCH_BCM2835
3939
help
4040
This selects the SDHost controller on BCM2835/6.
4141

‎drivers/mtd/nand/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ config MTD_SM_COMMON
4343

4444
config MTD_NAND_BCM2835_SMI
4545
tristate "Use Broadcom's Secondary Memory Interface as a NAND controller (BCM283x)"
46-
depends on (MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835) && BCM2835_SMI && MTD_NAND
46+
depends on BCM2835_SMI
4747
default m
4848
help
4949
Uses the BCM2835's SMI peripheral as a NAND controller.

‎drivers/pwm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ config PWM_BCM_KONA
9595

9696
config PWM_BCM2835
9797
tristate "BCM2835 PWM support"
98-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
98+
depends on ARCH_BCM2835
9999
help
100100
PWM framework driver for BCM2835 controller (Raspberry Pi)
101101

‎drivers/soc/bcm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ menu "Broadcom SoC drivers"
22

33
config RASPBERRYPI_POWER
44
bool "Raspberry Pi power domain driver"
5-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || (COMPILE_TEST && OF)
5+
depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
66
depends on RASPBERRYPI_FIRMWARE=y
77
select PM_GENERIC_DOMAINS if PM
88
help

‎drivers/spi/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ config SPI_AXI_SPI_ENGINE
9494
config SPI_BCM2835
9595
tristate "BCM2835 SPI controller"
9696
depends on GPIOLIB
97-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709 || COMPILE_TEST
97+
depends on ARCH_BCM2835 || COMPILE_TEST
9898
help
9999
This selects a driver for the Broadcom BCM2835 SPI master.
100100

@@ -105,7 +105,7 @@ config SPI_BCM2835
105105

106106
config SPI_BCM2835AUX
107107
tristate "BCM2835 SPI auxiliary controller"
108-
depends on ((ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709) && GPIOLIB) || COMPILE_TEST
108+
depends on (ARCH_BCM2835 && GPIOLIB) || COMPILE_TEST
109109
help
110110
This selects a driver for the Broadcom BCM2835 SPI aux master.
111111

‎drivers/tty/serial/8250/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ config SERIAL_8250_ACORN
291291

292292
config SERIAL_8250_BCM2835AUX
293293
tristate "BCM2835 auxiliar mini UART support"
294-
depends on ARCH_BCM2708 || ARCH_BCM2709 || ARCH_BCM2835 || COMPILE_TEST
294+
depends on ARCH_BCM2835 || COMPILE_TEST
295295
depends on SERIAL_8250 && SERIAL_8250_SHARE_IRQ
296296
help
297297
Support for the BCM2835 auxiliar mini UART.

‎drivers/watchdog/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ config BCM63XX_WDT
14401440

14411441
config BCM2835_WDT
14421442
tristate "Broadcom BCM2835 hardware watchdog"
1443-
depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
1443+
depends on ARCH_BCM2835
14441444
select WATCHDOG_CORE
14451445
help
14461446
Watchdog driver for the built in watchdog hardware in Broadcom

‎sound/arm/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ config SND_PXA2XX_AC97
3434

3535
config SND_BCM2835
3636
tristate "BCM2835 ALSA driver"
37-
depends on (ARCH_BCM2708 || ARCH_BCM2709 || ARCH_BCM2835) \
38-
&& BCM2708_VCHIQ && SND
37+
depends on ARCH_BCM2835 && BCM2708_VCHIQ && SND
3938
select SND_PCM
4039
help
4140
Say Y or M if you want to support BCM2835 Alsa pcm card driver

‎sound/soc/bcm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config SND_BCM2835_SOC_I2S
22
tristate "SoC Audio support for the Broadcom BCM2835 I2S module"
3-
depends on ARCH_BCM2835 || MACH_BCM2708 || MACH_BCM2709 || COMPILE_TEST
3+
depends on ARCH_BCM2835 || COMPILE_TEST
44
select SND_SOC_GENERIC_DMAENGINE_PCM
55
select REGMAP_MMIO
66
help

0 commit comments

Comments
 (0)