From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Sep 2022 20:20:59 +0000 (+0200)
Subject: Merge branch 'arm-multiplatform-cleanup' of https://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v6.6.17~6487^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8774d335446a11f514a98aaa1c0e8a7cfab33637;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'arm-multiplatform-cleanup' of https://git./linux/kernel/git/soc/soc into arm/soc

Now that everything except StrongARM is unified under
CONFIG_ARCH_MULTIPLATFORM, the option is rather meaningless
in its current form.

Rework the Kconfig logic to make this useful again, similar
to the way that RISC-V has CONFIG_NONPORTABLE (with the
opposite polarity), this now controls the visibility of
options that get in the way of building generic kernels,
while allowing custom kernels.

One side-effect is that 'randconfig' builds now rarely hit
strongarm machines, rather than testing them three quarters
of the time.

* 'arm-multiplatform-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: make ARCH_MULTIPLATFORM user-visible
  ARM: fix XIP_KERNEL dependencies
  ARM: Kconfig: clean up platform selection
  ARM: simplify machdirs/platdirs handling
  ARM: remove obsolete Makefile.boot infrastructure
---

8774d335446a11f514a98aaa1c0e8a7cfab33637
diff --cc arch/arm/mach-footbridge/Kconfig
index b7a4e403ba0f,1c9eae26e6ac..b5e7cbfed119
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@@ -41,14 -70,21 +54,12 @@@ config ARCH_NETWINDE
  
  	  Saying N will reduce the size of the Footbridge kernel.
  
- endmenu
- 
  # Footbridge support
  config FOOTBRIDGE
 -	select ARCH_HAS_PHYS_TO_DMA
 -	bool
 -
 -# Footbridge in host mode
 -config FOOTBRIDGE_HOST
 -	bool
 +	def_bool y
  	select ARCH_MIGHT_HAVE_PC_SERIO
 +	select ISA_DMA_API
  
 -# Footbridge in addin mode
 -config FOOTBRIDGE_ADDIN
 -	bool
 -
 -# EBSA285 board in either host or addin mode
  config ARCH_EBSA285
  	bool