tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc: Remove 40x from Kconfig and defconfig

Remove 40x from Kconfig, making the code unreachable.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240628121201.130802-3-mpe@ellerman.id.au

Michael Ellerman e939da89 839ff58e

+10 -43
+6 -6
arch/powerpc/Kconfig
··· 149 149 select ARCH_HAS_PTE_SPECIAL 150 150 select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64 151 151 select ARCH_HAS_SET_MEMORY 152 - select ARCH_HAS_STRICT_KERNEL_RWX if (PPC_BOOK3S || PPC_8xx || 40x) && !HIBERNATION 152 + select ARCH_HAS_STRICT_KERNEL_RWX if (PPC_BOOK3S || PPC_8xx) && !HIBERNATION 153 153 select ARCH_HAS_STRICT_KERNEL_RWX if PPC_85xx && !HIBERNATION && !RANDOMIZE_BASE 154 154 select ARCH_HAS_STRICT_MODULE_RWX if ARCH_HAS_STRICT_KERNEL_RWX 155 155 select ARCH_HAS_SYSCALL_WRAPPER if !SPU_BASE && !COMPAT ··· 167 167 select ARCH_SPLIT_ARG64 if PPC32 168 168 select ARCH_STACKWALK 169 169 select ARCH_SUPPORTS_ATOMIC_RMW 170 - select ARCH_SUPPORTS_DEBUG_PAGEALLOC if PPC_BOOK3S || PPC_8xx || 40x 170 + select ARCH_SUPPORTS_DEBUG_PAGEALLOC if PPC_BOOK3S || PPC_8xx 171 171 select ARCH_USE_BUILTIN_BSWAP 172 172 select ARCH_USE_CMPXCHG_LOCKREF if PPC64 173 173 select ARCH_USE_MEMTEST ··· 389 389 def_bool y 390 390 depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \ 391 391 (PPC_85xx && !PPC_E500MC) || PPC_86xx || PPC_PSERIES \ 392 - || 44x || 40x 392 + || 44x 393 393 394 394 config ARCH_SUSPEND_NONZERO_CPU 395 395 def_bool y ··· 443 443 444 444 config PPC_ADV_DEBUG_REGS 445 445 bool 446 - depends on 40x || BOOKE 446 + depends on BOOKE 447 447 default y 448 448 449 449 config PPC_ADV_DEBUG_IACS ··· 1077 1077 config PPC_INDIRECT_PCI 1078 1078 bool 1079 1079 depends on PCI 1080 - default y if 40x || 44x 1080 + default y if 44x 1081 1081 1082 1082 config SBUS 1083 1083 bool ··· 1102 1102 config PPC4xx_CPM 1103 1103 bool 1104 1104 default y 1105 - depends on SUSPEND && (44x || 40x) 1105 + depends on SUSPEND && 44x 1106 1106 help 1107 1107 PPC4xx Clock Power Management (CPM) support (suspend/resume). 1108 1108 It also enables support for two different idle states (idle-wait
-13
arch/powerpc/Kconfig.debug
··· 244 244 inbuilt serial port. If you enable this, ensure you set 245 245 PPC_EARLY_DEBUG_44x_PHYSLOW below to suit your target board. 246 246 247 - config PPC_EARLY_DEBUG_40x 248 - bool "Early serial debugging for IBM/AMCC 40x CPUs" 249 - depends on 40x 250 - help 251 - Select this to enable early debugging for IBM 40x chips via the 252 - inbuilt serial port. This works on chips with a 16550 compatible 253 - UART. 254 - 255 247 config PPC_EARLY_DEBUG_CPM 256 248 bool "Early serial debugging for Freescale CPM-based serial ports" 257 249 depends on SERIAL_CPM=y ··· 347 355 hex "EPRN of early debug UART physical address" 348 356 depends on PPC_EARLY_DEBUG_44x 349 357 default "0x1" 350 - 351 - config PPC_EARLY_DEBUG_40x_PHYSADDR 352 - hex "Early debug UART physical address" 353 - depends on PPC_EARLY_DEBUG_40x 354 - default "0xef600300" 355 358 356 359 config PPC_EARLY_DEBUG_CPM_ADDR 357 360 hex "CPM UART early debug transmit descriptor address"
-5
arch/powerpc/Makefile
··· 301 301 $(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/book3s_32.config \ 302 302 -f $(srctree)/Makefile allmodconfig 303 303 304 - generated_configs += ppc40x_allmodconfig 305 - ppc40x_allmodconfig: 306 - $(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/40x.config \ 307 - -f $(srctree)/Makefile allmodconfig 308 - 309 304 generated_configs += ppc44x_allmodconfig 310 305 ppc44x_allmodconfig: 311 306 $(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/powerpc/configs/44x.config \
-2
arch/powerpc/configs/40x.config
··· 1 - CONFIG_PPC64=n 2 - CONFIG_40x=y
+4 -17
arch/powerpc/platforms/Kconfig.cputype
··· 43 43 select HAVE_ARCH_VMAP_STACK 44 44 select HUGETLBFS 45 45 46 - config 40x 47 - bool "AMCC 40x" 48 - select PPC_DCR_NATIVE 49 - select PPC_UDBG_16550 50 - select 4xx_SOC 51 - select HAVE_PCI 52 - select PPC_KUEP if PPC_KUAP 53 - 54 46 config 44x 55 47 bool "AMCC 44x, 46x or 47x" 56 48 select PPC_DCR_NATIVE ··· 186 194 depends on !CC_IS_CLANG 187 195 select PPC_HAS_LBARX_LHARX 188 196 189 - config 405_CPU 190 - bool "40x family" 191 - depends on 40x 192 - depends on !CC_IS_CLANG 193 - 194 197 config 440_CPU 195 198 bool "440 (44x family)" 196 199 depends on 44x ··· 327 340 328 341 config 4xx 329 342 bool 330 - depends on 40x || 44x 343 + depends on 44x 331 344 default y 332 345 333 346 config BOOKE ··· 337 350 338 351 config BOOKE_OR_40x 339 352 bool 340 - depends on BOOKE || 40x 353 + depends on BOOKE 341 354 default y 342 355 343 356 config PTE_64BIT ··· 482 495 This option builds the kernel with the pc relative ABI model. 483 496 484 497 config PPC_KUEP 485 - bool "Kernel Userspace Execution Prevention" if !40x 486 - default y if !40x 498 + bool "Kernel Userspace Execution Prevention" 499 + default y 487 500 help 488 501 Enable support for Kernel Userspace Execution Prevention (KUEP) 489 502