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

Merge tag 'xtensa-20250603' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa updates from Max Filippov:

- migrate to the generic rule for built-in DTB

- cleanups in code and common_defconfig

* tag 'xtensa-20250603' of https://github.com/jcmvbkbc/linux-xtensa:
arch: xtensa: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX
xtensa: migrate to the generic rule for built-in DTB
xtensa: ptrace: Remove zero-length alignment array

Linus Torvalds f5164456 c00b2850

+12 -15
+1 -1
arch/xtensa/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - obj-y += kernel/ mm/ platforms/ boot/dts/ 2 + obj-y += kernel/ mm/ platforms/
+2 -1
arch/xtensa/Kconfig
··· 20 20 select ARCH_USE_QUEUED_SPINLOCKS 21 21 select ARCH_WANT_IPC_PARSE_VERSION 22 22 select BUILDTIME_TABLE_SORT 23 + select GENERIC_BUILTIN_DTB 23 24 select CLONE_BACKWARDS 24 25 select COMMON_CLK 25 26 select DMA_NONCOHERENT_MMAP if MMU ··· 463 462 help 464 463 Include support for flattened device tree machine descriptions. 465 464 466 - config BUILTIN_DTB_SOURCE 465 + config BUILTIN_DTB_NAME 467 466 string "DTB to build into the kernel image" 468 467 depends on OF 469 468
+1 -1
arch/xtensa/boot/dts/Makefile
··· 7 7 # 8 8 # 9 9 10 - obj-$(CONFIG_OF) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE)) 10 + dtb-$(CONFIG_OF) += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME)) 11 11 12 12 # for CONFIG_OF_ALL_DTBS test 13 13 dtb- := $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))
+1 -1
arch/xtensa/configs/audio_kc705_defconfig
··· 30 30 CONFIG_CMDLINE_BOOL=y 31 31 CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0" 32 32 CONFIG_USE_OF=y 33 - CONFIG_BUILTIN_DTB_SOURCE="kc705" 33 + CONFIG_BUILTIN_DTB_NAME="kc705" 34 34 # CONFIG_COMPACTION is not set 35 35 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 36 36 CONFIG_PM=y
+1 -1
arch/xtensa/configs/cadence_csp_defconfig
··· 34 34 # CONFIG_PCI is not set 35 35 CONFIG_XTENSA_PLATFORM_XTFPGA=y 36 36 CONFIG_USE_OF=y 37 - CONFIG_BUILTIN_DTB_SOURCE="csp" 37 + CONFIG_BUILTIN_DTB_NAME="csp" 38 38 # CONFIG_COMPACTION is not set 39 39 CONFIG_XTFPGA_LCD=y 40 40 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-1
arch/xtensa/configs/common_defconfig
··· 32 32 CONFIG_NET_SCH_TBF=m 33 33 CONFIG_NET_SCH_GRED=m 34 34 CONFIG_NET_SCH_DSMARK=m 35 - CONFIG_NET_CLS_TCINDEX=m 36 35 CONFIG_NET_CLS_ROUTE4=m 37 36 CONFIG_NET_CLS_FW=m 38 37 CONFIG_NET_CLS_U32=m
+1 -1
arch/xtensa/configs/generic_kc705_defconfig
··· 29 29 CONFIG_CMDLINE_BOOL=y 30 30 CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0" 31 31 CONFIG_USE_OF=y 32 - CONFIG_BUILTIN_DTB_SOURCE="kc705" 32 + CONFIG_BUILTIN_DTB_NAME="kc705" 33 33 # CONFIG_COMPACTION is not set 34 34 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35 35 CONFIG_NET=y
+1 -1
arch/xtensa/configs/nommu_kc705_defconfig
··· 36 36 CONFIG_CMDLINE_BOOL=y 37 37 CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=256M@0x60000000" 38 38 CONFIG_USE_OF=y 39 - CONFIG_BUILTIN_DTB_SOURCE="kc705_nommu" 39 + CONFIG_BUILTIN_DTB_NAME="kc705_nommu" 40 40 CONFIG_BINFMT_FLAT=y 41 41 CONFIG_NET=y 42 42 CONFIG_PACKET=y
+1 -1
arch/xtensa/configs/smp_lx200_defconfig
··· 33 33 CONFIG_CMDLINE_BOOL=y 34 34 CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=96M@0" 35 35 CONFIG_USE_OF=y 36 - CONFIG_BUILTIN_DTB_SOURCE="lx200mx" 36 + CONFIG_BUILTIN_DTB_NAME="lx200mx" 37 37 # CONFIG_COMPACTION is not set 38 38 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 39 39 CONFIG_NET=y
+1 -1
arch/xtensa/configs/virt_defconfig
··· 24 24 CONFIG_CMDLINE_BOOL=y 25 25 CONFIG_CMDLINE="console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x80000000@0" 26 26 CONFIG_USE_OF=y 27 - CONFIG_BUILTIN_DTB_SOURCE="virt" 27 + CONFIG_BUILTIN_DTB_NAME="virt" 28 28 # CONFIG_PARSE_BOOTPARAM is not set 29 29 CONFIG_JUMP_LABEL=y 30 30 CONFIG_MODULES=y
+1 -1
arch/xtensa/configs/xip_kc705_defconfig
··· 29 29 CONFIG_CMDLINE_BOOL=y 30 30 CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0" 31 31 CONFIG_USE_OF=y 32 - CONFIG_BUILTIN_DTB_SOURCE="kc705" 32 + CONFIG_BUILTIN_DTB_NAME="kc705" 33 33 # CONFIG_PARSE_BOOTPARAM is not set 34 34 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 35 35 # CONFIG_COMPACTION is not set
+1 -4
arch/xtensa/include/asm/ptrace.h
··· 72 72 /* Additional configurable registers that are used by the compiler. */ 73 73 xtregs_opt_t xtregs_opt; 74 74 75 - /* Make sure the areg field is 16 bytes aligned. */ 76 - int align[0] __attribute__ ((aligned(16))); 77 - 78 75 /* current register frame. 79 76 * Note: The ESF for kernel exceptions ends after 16 registers! 80 77 */ 81 - unsigned long areg[XCHAL_NUM_AREGS]; 78 + unsigned long areg[XCHAL_NUM_AREGS] __aligned(16); 82 79 }; 83 80 84 81 # define arch_has_single_step() (1)