Commit f5164456 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c00b2850 3d6d2388

arch/xtensa/Kbuild

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y += kernel/ mm/ platforms/ boot/dts/
 
obj-y += kernel/ mm/ platforms/

arch/xtensa/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config XTENSA 
	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_TABLE_SORT

	select GENERIC_BUILTIN_DTB

	select CLONE_BACKWARDS

	select COMMON_CLK

	select DMA_NONCOHERENT_MMAP if MMU
@@ -462,7 +463,7 @@ config USE_OF 
	help

	  Include support for flattened device tree machine descriptions.



config BUILTIN_DTB_SOURCE

config BUILTIN_DTB_NAME

	string "DTB to build into the kernel image"

	depends on OF

arch/xtensa/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#

#



obj-$(CONFIG_OF) += $(addsuffix .dtb.o, $(CONFIG_BUILTIN_DTB_SOURCE))

dtb-$(CONFIG_OF) += $(addsuffix .dtb, $(CONFIG_BUILTIN_DTB_NAME))



# for CONFIG_OF_ALL_DTBS test

dtb-	:= $(patsubst $(src)/%.dts,%.dtb, $(wildcard $(src)/*.dts))

arch/xtensa/configs/audio_kc705_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ CONFIG_XTENSA_PLATFORM_XTFPGA=y 
CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32native,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x38000000@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB_SOURCE="kc705"

CONFIG_BUILTIN_DTB_NAME="kc705"

# CONFIG_COMPACTION is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

arch/xtensa/configs/cadence_csp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ CONFIG_HIGHMEM=y 
# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB_SOURCE="csp"

CONFIG_BUILTIN_DTB_NAME="csp"

# CONFIG_COMPACTION is not set

CONFIG_XTFPGA_LCD=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set