diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-15 22:20:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-15 22:20:59 +0200 |
| commit | 8774d335446a11f514a98aaa1c0e8a7cfab33637 (patch) | |
| tree | 064625991e1ef37af44b4f34f7805a40309b793f /arch/arm/mach-footbridge | |
| parent | 0d9787fa274324ddbbe211c99ea44e86a3f55847 (diff) | |
| parent | 84fc863606239d8b434e59e6bbbe805f457e5767 (diff) | |
| download | linux-8774d335446a11f514a98aaa1c0e8a7cfab33637.tar.gz linux-8774d335446a11f514a98aaa1c0e8a7cfab33637.tar.bz2 linux-8774d335446a11f514a98aaa1c0e8a7cfab33637.zip | |
Merge branch 'arm-multiplatform-cleanup' of https://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/Kconfig | 19 | ||||
| -rw-r--r-- | arch/arm/mach-footbridge/Makefile.boot | 5 |
2 files changed, 15 insertions, 9 deletions
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig index b7a4e403ba0f..b5e7cbfed119 100644 --- a/arch/arm/mach-footbridge/Kconfig +++ b/arch/arm/mach-footbridge/Kconfig @@ -1,7 +1,20 @@ # SPDX-License-Identifier: GPL-2.0-only -if ARCH_FOOTBRIDGE +menuconfig ARCH_FOOTBRIDGE + bool "FootBridge Implementations" + depends on ARCH_MULTI_V4 && !(ARCH_MULTI_V4T || ARCH_MULTI_V5) + depends on !(ARCH_MOXART || ARCH_GEMINI || ARCH_SA1100) + depends on ATAGS + depends on CPU_LITTLE_ENDIAN + depends on MMU + select ARCH_NO_SG_CHAIN + select CPU_SA110 + select FOOTBRIDGE + select NEED_MACH_MEMORY_H + help + Support for systems based on the DC21285 companion chip + ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. -menu "Footbridge Implementations" +if ARCH_FOOTBRIDGE config ARCH_CATS bool "CATS" @@ -41,8 +54,6 @@ config ARCH_NETWINDER Saying N will reduce the size of the Footbridge kernel. -endmenu - # Footbridge support config FOOTBRIDGE def_bool y diff --git a/arch/arm/mach-footbridge/Makefile.boot b/arch/arm/mach-footbridge/Makefile.boot deleted file mode 100644 index e4313e912cac..000000000000 --- a/arch/arm/mach-footbridge/Makefile.boot +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 - |