1 From deda44895d289a72a235359fc21f8a62ea44dc1c Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Tue, 6 Mar 2018 09:33:26 +0100
4 Subject: [PATCH 26/27] MIPS: ath79: sanitize Kconfig symbols
6 Signed-off-by: John Crispin <john@phrozen.org>
8 arch/mips/Kconfig | 2 ++
9 arch/mips/ath79/Kconfig | 48 +++++-------------------------------------------
10 arch/mips/ath79/Makefile | 10 ----------
11 arch/mips/pci/Makefile | 2 +-
12 4 files changed, 8 insertions(+), 54 deletions(-)
14 Index: linux-4.14.18/arch/mips/Kconfig
15 ===================================================================
16 --- linux-4.14.18.orig/arch/mips/Kconfig
17 +++ linux-4.14.18/arch/mips/Kconfig
18 @@ -203,6 +203,8 @@ config ATH79
19 select SYS_SUPPORTS_BIG_ENDIAN
20 select SYS_SUPPORTS_MIPS16
21 select SYS_SUPPORTS_ZBOOT_UART_PROM
23 + select USB_ARCH_HAS_EHCI
26 Support for the Atheros AR71XX/AR724X/AR913X SoCs.
27 Index: linux-4.14.18/arch/mips/ath79/Kconfig
28 ===================================================================
29 --- linux-4.14.18.orig/arch/mips/ath79/Kconfig
30 +++ linux-4.14.18/arch/mips/ath79/Kconfig
32 # SPDX-License-Identifier: GPL-2.0
41 - select PCI_AR724X if PCI
52 - select PCI_AR724X if PCI
56 - select USB_ARCH_HAS_EHCI
61 - select PCI_AR724X if PCI
63 + bool "PCI support for AR7100 type SoCs"
70 -config ATH79_DEV_GPIO_BUTTONS
73 -config ATH79_DEV_LEDS_GPIO
82 -config ATH79_DEV_WMAC
83 - depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA953X || SOC_QCA955X || SOC_QCA956X)
84 + bool "PCI support for AR724x type SoCs"
89 Index: linux-4.14.18/arch/mips/ath79/Makefile
90 ===================================================================
91 --- linux-4.14.18.orig/arch/mips/ath79/Makefile
92 +++ linux-4.14.18/arch/mips/ath79/Makefile
94 obj-y := prom.o setup.o common.o clock.o
96 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
101 -obj-y += dev-common.o
102 -obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS) += dev-gpio-buttons.o
103 -obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev-leds-gpio.o
104 -obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o
105 -obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o
106 -obj-$(CONFIG_ATH79_DEV_WMAC) += dev-wmac.o
107 Index: linux-4.14.18/arch/mips/pci/Makefile
108 ===================================================================
109 --- linux-4.14.18.orig/arch/mips/pci/Makefile
110 +++ linux-4.14.18/arch/mips/pci/Makefile
111 @@ -23,7 +23,7 @@ obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o
113 obj-$(CONFIG_MIPS_ALCHEMY) += pci-alchemy.o
114 obj-$(CONFIG_PCI_AR2315) += pci-ar2315.o
115 -obj-$(CONFIG_SOC_AR71XX) += pci-ar71xx.o
116 +obj-$(CONFIG_PCI_AR71XX) += pci-ar71xx.o
117 obj-$(CONFIG_PCI_AR724X) += pci-ar724x.o
118 obj-$(CONFIG_MIPS_PCI_VIRTIO) += pci-virtio-guest.o