target/linux/ath79/patches-4.14/0026-MIPS-ath79-sanitize-Kconfig-symbols.patch

   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
   5
   6 Signed-off-by: John Crispin <john@phrozen.org>
   7 ---
   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(-)
  13
  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
  22 +       select HW_HAS_PCI
  23 +       select USB_ARCH_HAS_EHCI
  24         select USE_OF
  25         help
  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
  31 @@ -1,52 +1,14 @@
  32  # SPDX-License-Identifier: GPL-2.0
  33  if ATH79
  34
  35 -config SOC_AR71XX
  36 -       select HW_HAS_PCI
  37 -       def_bool n
  38 -
  39 -config SOC_AR724X
  40 -       select HW_HAS_PCI
  41 -       select PCI_AR724X if PCI
  42 -       def_bool n
  43 -
  44 -config SOC_AR913X
  45 -       def_bool n
  46 -
  47 -config SOC_AR933X
  48 -       def_bool n
  49 -
  50 -config SOC_AR934X
  51 -       select HW_HAS_PCI
  52 -       select PCI_AR724X if PCI
  53 -       def_bool n
  54 -
  55 -config SOC_QCA953X
  56 -       select USB_ARCH_HAS_EHCI
  57 -       def_bool n
  58 -
  59 -config SOC_QCA955X
  60 -       select HW_HAS_PCI
  61 -       select PCI_AR724X if PCI
  62 +config PCI_AR71XX
  63 +       bool "PCI support for AR7100 type SoCs"
  64 +       depends on PCI
  65         def_bool n
  66
  67  config PCI_AR724X
  68 -       def_bool n
  69 -
  70 -config ATH79_DEV_GPIO_BUTTONS
  71 -       def_bool n
  72 -
  73 -config ATH79_DEV_LEDS_GPIO
  74 -       def_bool n
  75 -
  76 -config ATH79_DEV_SPI
  77 -       def_bool n
  78 -
  79 -config ATH79_DEV_USB
  80 -       def_bool n
  81 -
  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"
  85 +       depends on PCI
  86         def_bool n
  87
  88  endif
  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
  93 @@ -11,13 +11,3 @@
  94  obj-y  := prom.o setup.o common.o clock.o
  95
  96  obj-$(CONFIG_EARLY_PRINTK)             += early_printk.o
  97 -
  98 -#
  99 -# Devices
 100 -#
 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
 112                                         ops-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
 119  #