diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 396680975506..e7a7ed2b7ef7 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -16,10 +16,6 @@ CONFIG_PROFILING=y CONFIG_KEXEC=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_PXA=y -CONFIG_ARCH_GUMSTIX=y -CONFIG_PXA_SHARPSL=y -CONFIG_MACH_AKITA=y -CONFIG_MACH_BORZOI=y CONFIG_ARCH_FORCE_MAX_ORDER=8 CONFIG_CMDLINE="root=/dev/ram0 ro" CONFIG_CPU_FREQ=y diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 66e26990e2c8..1fa282a9ef38 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -58,12 +58,15 @@ if ATAGS comment "Legacy board files" config ARCH_GUMSTIX - bool "Gumstix XScale 255 boards" + bool "Gumstix XScale 255 boards (DEPRECATED)" select PXA25x help Say Y here if you intend to run this kernel on Basix, Connex, ws-200ax, ws-400ax systems + Support for this machine will go away in early 2027, + unless it gets converted to device tree. + choice prompt "Gumstix Carrier/Expansion Board" depends on ARCH_GUMSTIX @@ -77,7 +80,7 @@ config GUMSTIX_AM300EPD endchoice config PXA_SHARPSL - bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" + bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models (DEPRECATED)" select SHARP_PARAM select SHARP_SCOOP help @@ -87,6 +90,9 @@ config PXA_SHARPSL SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) handheld computer. + Support for these machines will go away in early 2027, + unless they get converted to device tree. + config PXA_SHARPSL_DETECT_MACH_ID bool "Detect machine ID at run-time in the decompressor" depends on PXA_SHARPSL