Commit 4218a96f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_5.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull more MIPS updates from Thomas Bogendoerfer:

 - Config updates for BMIPS platform

 - Build fixes

 - Makefile cleanups

* tag 'mips_5.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  mips: decompressor: do not copy source files while building
  MIPS: boot/compressed/: add __bswapdi2() to target for ZSTD decompression
  MIPS: fix duplicated slashes for Platform file path
  MIPS: fix *-pkg builds for loongson2ef platform
  PCI: brcmstb: Allow building for BMIPS_GENERIC
  MIPS: BMIPS: Enable PCI Kconfig
  MIPS: VDSO: remove -nostdlib compiler flag
  mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set
  MIPS: Update bmips_stb_defconfig
  MIPS: Allow modules to set board_be_handler
parents 66f4beaa f78b25ee

arch/mips/Kbuild.platforms

+1 −1
Original line number Diff line number Diff line
@@ -37,4 +37,4 @@ platform-$(CONFIG_MACH_TX49XX) += txx9/ 
platform-$(CONFIG_MACH_VR41XX)		+= vr41xx/



# include the platform specific files

include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platform-y))
 
include $(patsubst %/, $(srctree)/arch/mips/%/Platform, $(platform-y))

arch/mips/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -292,6 +292,8 @@ config BMIPS_GENERIC 
	select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN

	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select HARDIRQS_SW_RESEND

	select HAVE_PCI

	select PCI_DRIVERS_GENERIC

	help

	  Build a generic DT-based kernel image that boots on select

	  BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
@@ -333,6 +335,9 @@ config BCM63XX 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_CPU_BMIPS32_3300

	select SYS_HAS_CPU_BMIPS4350

	select SYS_HAS_CPU_BMIPS4380

	select SWAP_IO_SPACE

	select GPIOLIB

	select MIPS_L1_CACHE_SHIFT_4

arch/mips/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -253,7 +253,9 @@ endif 
#

# Board-dependent options and extra files

#

ifdef need-compiler

include $(srctree)/arch/mips/Kbuild.platforms

endif



ifdef CONFIG_PHYSICAL_START

load-y					= $(CONFIG_PHYSICAL_START)

arch/mips/boot/compressed/.gitignore

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

ashldi3.c

bswapsi.c

arch/mips/boot/compressed/Makefile

+1 −11
Original line number Diff line number Diff line
@@ -50,19 +50,9 @@ vmlinuzobjs-$(CONFIG_MIPS_ALCHEMY) += $(obj)/uart-alchemy.o 
vmlinuzobjs-$(CONFIG_ATH79)			   += $(obj)/uart-ath79.o

endif



extra-y += uart-ath79.c

$(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c

	$(call cmd,shipped)



vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o



extra-y += ashldi3.c

$(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE

	$(call if_changed,shipped)



extra-y += bswapsi.c

$(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c FORCE

	$(call if_changed,shipped)

vmlinuzobjs-$(CONFIG_KERNEL_ZSTD) += $(obj)/bswapdi.o



targets := $(notdir $(vmlinuzobjs-y))