Merge branch 'for-next/kconfig'

8 files changed, 3 insertions, 44 deletions

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 77b3e9db64..54fa9b8aa2 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -6,9 +6,6 @@ config HAVE_AT91_UTMI
 config HAVE_AT91_USB_CLK
 	bool
 
-config HAVE_AT91_PIO4
-	bool
-
 config COMMON_CLK_AT91
 	bool
 	select COMMON_CLK
@@ -142,7 +139,6 @@ config SOC_AT91RM9200
 	bool
 	select CPU_ARM920T
 	select HAS_AT91_ETHER
-	select HAVE_AT91_DBGU0
 	select HAVE_AT91_USB_CLK
 	select PINCTRL_AT91
 
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index e9228809f0..220b635167 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -19,9 +19,6 @@
 menu "OMAP Features"
 	depends on ARCH_OMAP
 
-config MACH_OMAP
-	bool
-
 config ARCH_OMAP3
 	bool
 	select CPU_V7
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 06ad1885a6..fd9084f83e 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -72,7 +72,6 @@ config MACH_MAINSTONE
 	  Say Y here if you are using a Mainstone board
 config MACH_MIOA701
 	bool "Mitac Mio A701"
-	select BCH_CONST_PARAMS
 	select PWM
 	select POLLER
 	help
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 3d8fc8ba42..2da875cef0 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -8,11 +8,6 @@ config ARCH_SOCFPGA_XLOAD
 	bool
 	prompt "Build preloader image"
 
-config ARCH_TEXT_BASE
-	hex
-	default 0x00100000 if MACH_SOCFPGA_CYCLONE5
-	default 0xffe00000 if MACH_SOCFPGA_ARRIA10
-
 comment "Altera SoCFPGA System-on-Chip"
 
 config ARCH_SOCFPGA_CYCLONE5
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 160732fbef..f144d346b4 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -4,9 +4,6 @@ config ARCH_TEXT_BASE
 	hex
 	default 0x0
 
-config BOARDINFO
-	default ""
-
 # ---------------------------------------------------------
 
 config ARCH_TEGRA_2x_SOC
diff --git a/arch/mips/mach-ath79/Kconfig b/arch/mips/mach-ath79/Kconfig
index 97eea6a2a2..9dab5fc92a 100644
--- a/arch/mips/mach-ath79/Kconfig
+++ b/arch/mips/mach-ath79/Kconfig
@@ -6,6 +6,9 @@ config SOC_QCA_AR9331
 config SOC_QCA_AR9344
 	bool
 
+config SOC_QCA_QCA4531
+	bool
+
 if DEBUG_LL
 choice
 	prompt "DEBUG_LL driver"
diff --git a/arch/powerpc/mach-mpc5xxx/Kconfig b/arch/powerpc/mach-mpc5xxx/Kconfig
index 180aa32ad1..4da947dc6c 100644
--- a/arch/powerpc/mach-mpc5xxx/Kconfig
+++ b/arch/powerpc/mach-mpc5xxx/Kconfig
@@ -34,17 +34,4 @@ config MPC5xxx
 	depends on MACH_PHYCORE_MPC5200B_TINY
 	default y
 
-menu "Board specific settings"
-
-config MACH_PHYCORE_MPC5200B_TINY_REV
-	int "Board Revision"
-	default 1
-	depends on MACH_PHYCORE_MPC5200B_TINY
-	help
-	  Revision 0 and revision 1 of the tiny board have
-	  incompatible flash settings. Unless you have a very
-	  old board you should set this option to 1
-
-endmenu
-
 endif
diff --git a/arch/x86/mach-i386/Kconfig b/arch/x86/mach-i386/Kconfig
index b64d21fd9a..2d0bfb4759 100644
--- a/arch/x86/mach-i386/Kconfig
+++ b/arch/x86/mach-i386/Kconfig
@@ -3,26 +3,11 @@ menu "Board specific settings"
 
 if X86_BOOTLOADER
 
-config X86_GENERIC_HAS_ISA
-	bool "ISA support"
-	help
-	  Say Y here if the target supports a ISA bus
-
-config X86_GENERIC_HAS_PCI
-	bool "PCI support"
-	help
-	  Say Y here if the target supports a PCI bus
-
 config X86_GENERIC_HAS_VIDEO
 	bool "video support"
 	help
 	  Say Y here if the target supports a video output
 
-config X86_GENERIC_HAS_USB
-	bool "USB support"
-	help
-	  Say Y here if the target supports a USB interface
-
 endif
 
 endmenu