Skip to content

Commit 4218a96

Browse files
torvaldstorvalds
committed
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
2 parents 66f4bea + f78b25e commit 4218a96

25 files changed

Lines changed: 192 additions & 39 deletions

File tree

‎arch/mips/Kbuild.platforms‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ platform-$(CONFIG_MACH_TX49XX) += txx9/
3737
platform-$(CONFIG_MACH_VR41XX) += vr41xx/
3838

3939
# include the platform specific files
40-
include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platform-y))
40+
include $(patsubst %/, $(srctree)/arch/mips/%/Platform, $(platform-y))

‎arch/mips/Kconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ config BMIPS_GENERIC
292292
select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
293293
select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
294294
select HARDIRQS_SW_RESEND
295+
select HAVE_PCI
296+
select PCI_DRIVERS_GENERIC
295297
help
296298
Build a generic DT-based kernel image that boots on select
297299
BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
@@ -333,6 +335,9 @@ config BCM63XX
333335
select SYS_SUPPORTS_32BIT_KERNEL
334336
select SYS_SUPPORTS_BIG_ENDIAN
335337
select SYS_HAS_EARLY_PRINTK
338+
select SYS_HAS_CPU_BMIPS32_3300
339+
select SYS_HAS_CPU_BMIPS4350
340+
select SYS_HAS_CPU_BMIPS4380
336341
select SWAP_IO_SPACE
337342
select GPIOLIB
338343
select MIPS_L1_CACHE_SHIFT_4

‎arch/mips/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,9 @@ endif
253253
#
254254
# Board-dependent options and extra files
255255
#
256+
ifdef need-compiler
256257
include $(srctree)/arch/mips/Kbuild.platforms
258+
endif
257259

258260
ifdef CONFIG_PHYSICAL_START
259261
load-y = $(CONFIG_PHYSICAL_START)

‎arch/mips/boot/compressed/.gitignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎arch/mips/boot/compressed/Makefile‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,9 @@ vmlinuzobjs-$(CONFIG_MIPS_ALCHEMY) += $(obj)/uart-alchemy.o
5050
vmlinuzobjs-$(CONFIG_ATH79) += $(obj)/uart-ath79.o
5151
endif
5252

53-
extra-y += uart-ath79.c
54-
$(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c
55-
$(call cmd,shipped)
56-
5753
vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o
5854

59-
extra-y += ashldi3.c
60-
$(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE
61-
$(call if_changed,shipped)
62-
63-
extra-y += bswapsi.c
64-
$(obj)/bswapsi.c: $(obj)/%.c: $(srctree)/arch/mips/lib/%.c FORCE
65-
$(call if_changed,shipped)
55+
vmlinuzobjs-$(CONFIG_KERNEL_ZSTD) += $(obj)/bswapdi.o
6656

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

‎arch/mips/boot/compressed/ashldi3.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
#include "../../../../lib/ashldi3.c"

‎arch/mips/boot/compressed/bswapdi.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
#include "../../lib/bswapdi.c"

‎arch/mips/boot/compressed/bswapsi.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
#include "../../lib/bswapsi.c"

‎arch/mips/boot/compressed/uart-ath79.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
#include "../../ath79/early_printk.c"

‎arch/mips/configs/bmips_stb_defconfig‎

Lines changed: 147 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
# CONFIG_SWAP is not set
33
CONFIG_NO_HZ=y
4+
CONFIG_HZ=1000
45
CONFIG_BLK_DEV_INITRD=y
56
CONFIG_EXPERT=y
67
# CONFIG_VM_EVENT_COUNTERS is not set
78
# CONFIG_SLUB_DEBUG is not set
89
CONFIG_BMIPS_GENERIC=y
910
CONFIG_CPU_LITTLE_ENDIAN=y
1011
CONFIG_HIGHMEM=y
12+
CONFIG_HIGH_RES_TIMERS=y
1113
CONFIG_SMP=y
1214
CONFIG_NR_CPUS=4
15+
CONFIG_CC_STACKPROTECTOR_STRONG=y
1316
# CONFIG_SECCOMP is not set
1417
CONFIG_MIPS_O32_FP64_SUPPORT=y
18+
# CONFIG_RD_GZIP is not set
19+
# CONFIG_RD_BZIP2 is not set
20+
# CONFIG_RD_LZMA is not set
21+
CONFIG_RD_XZ=y
22+
# CONFIG_RD_LZO is not set
23+
# CONFIG_RD_LZ4 is not set
24+
# CONFIG_IOSCHED_DEADLINE is not set
25+
# CONFIG_IOSCHED_CFQ is not set
26+
CONFIG_PCI=y
27+
CONFIG_PCI_MSI=y
28+
CONFIG_PCIEASPM_POWERSAVE=y
29+
CONFIG_PCIEPORTBUS=y
30+
CONFIG_PCIE_BRCMSTB=y
1531
CONFIG_CPU_FREQ=y
1632
CONFIG_CPU_FREQ_STAT=y
33+
CONFIG_CPU_FREQ_STAT_DETAILS=y
34+
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
35+
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
1736
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
1837
CONFIG_CPU_FREQ_GOV_USERSPACE=y
1938
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
2039
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
21-
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
2240
CONFIG_BMIPS_CPUFREQ=y
2341
# CONFIG_BLK_DEV_BSG is not set
2442
CONFIG_NET=y
@@ -32,32 +50,99 @@ CONFIG_INET=y
3250
# CONFIG_INET_DIAG is not set
3351
CONFIG_CFG80211=y
3452
CONFIG_NL80211_TESTMODE=y
53+
CONFIG_WIRELESS=y
3554
CONFIG_MAC80211=y
55+
CONFIG_NL80211=y
3656
CONFIG_DEVTMPFS=y
3757
CONFIG_DEVTMPFS_MOUNT=y
3858
# CONFIG_STANDALONE is not set
3959
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
60+
CONFIG_BRCMSTB_GISB_ARB=y
61+
CONFIG_MODULES=y
62+
CONFIG_MODULE_FORCE_LOAD=y
63+
CONFIG_MODULE_UNLOAD=y
64+
CONFIG_MODVERSIONS=y
65+
CONFIG_IP_MULTICAST=y
66+
CONFIG_IP_PNP=y
67+
CONFIG_IP_PNP_DHCP=y
68+
CONFIG_IP_PNP_BOOTP=y
69+
CONFIG_IP_PNP_RARP=y
70+
CONFIG_IP_MROUTE=y
71+
CONFIG_IP_PIMSM_V1=y
72+
CONFIG_IP_PIMSM_V2=y
73+
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
74+
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
75+
# CONFIG_INET_XFRM_MODE_BEET is not set
76+
# CONFIG_INET_LRO is not set
77+
CONFIG_INET_UDP_DIAG=y
78+
CONFIG_TCP_CONG_ADVANCED=y
79+
CONFIG_TCP_CONG_BIC=y
80+
# CONFIG_TCP_CONG_WESTWOOD is not set
81+
# CONFIG_TCP_CONG_HTCP is not set
82+
# CONFIG_IPV6 is not set
83+
CONFIG_IP_NF_IPTABLES=y
84+
CONFIG_IP_NF_FILTER=y
85+
CONFIG_NETFILTER=y
86+
CONFIG_NETFILTER_XTABLES=y
87+
CONFIG_BRIDGE=y
88+
CONFIG_BRIDGE_NETFILTER=m
89+
CONFIG_BRIDGE_NF_EBTABLES=m
90+
CONFIG_BRIDGE_EBT_BROUTE=m
91+
CONFIG_NET_DSA=y
92+
CONFIG_NET_SWITCHDEV=y
93+
CONFIG_DMA_CMA=y
94+
CONFIG_CMA_ALIGNMENT=12
95+
CONFIG_SPI=y
96+
CONFIG_SPI_BRCMSTB=y
4097
CONFIG_MTD=y
98+
CONFIG_MTD_CMDLINE_PARTS=y
99+
CONFIG_MTD_BLOCK=y
41100
CONFIG_MTD_CFI=y
101+
CONFIG_MTD_JEDECPROBE=y
42102
CONFIG_MTD_CFI_INTELEXT=y
43103
CONFIG_MTD_CFI_AMDSTD=y
44-
CONFIG_MTD_PHYSMAP=y
104+
CONFIG_MTD_CFI_STAA=y
105+
CONFIG_MTD_ROM=y
106+
CONFIG_MTD_ABSENT=y
107+
CONFIG_MTD_PHYSMAP_OF=y
108+
CONFIG_MTD_M25P80=y
109+
CONFIG_MTD_NAND=y
110+
CONFIG_MTD_NAND_BRCMNAND=y
111+
CONFIG_MTD_SPI_NOR=y
112+
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
113+
CONFIG_MTD_UBI=y
114+
CONFIG_MTD_UBI_GLUEBI=y
115+
CONFIG_PROC_DEVICETREE=y
116+
CONFIG_BLK_DEV_LOOP=y
117+
CONFIG_BLK_DEV_RAM=y
118+
CONFIG_BLK_DEV_RAM_SIZE=8192
45119
# CONFIG_BLK_DEV is not set
46120
CONFIG_SCSI=y
47121
CONFIG_BLK_DEV_SD=y
122+
CONFIG_CHR_DEV_SG=y
123+
CONFIG_SCSI_MULTI_LUN=y
48124
# CONFIG_SCSI_LOWLEVEL is not set
49125
CONFIG_NETDEVICES=y
126+
CONFIG_VLAN_8021Q=y
127+
CONFIG_MACVLAN=y
50128
CONFIG_BCMGENET=y
51129
CONFIG_USB_USBNET=y
52-
# CONFIG_INPUT is not set
130+
CONFIG_INPUT_EVDEV=y
131+
# CONFIG_INPUT_KEYBOARD is not set
132+
# CONFIG_INPUT_MOUSE is not set
133+
CONFIG_INPUT_MISC=y
134+
CONFIG_INPUT_UINPUT=y
53135
# CONFIG_SERIO is not set
54-
# CONFIG_VT is not set
136+
CONFIG_VT=y
137+
CONFIG_VT_HW_CONSOLE_BINDING=y
138+
# CONFIG_DEVKMEM is not set
55139
CONFIG_SERIAL_8250=y
56140
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
57141
CONFIG_SERIAL_8250_CONSOLE=y
58142
CONFIG_SERIAL_OF_PLATFORM=y
59143
# CONFIG_HW_RANDOM is not set
60144
CONFIG_POWER_RESET=y
145+
CONFIG_POWER_RESET_BRCMSTB=y
61146
CONFIG_POWER_RESET_SYSCON=y
62147
CONFIG_POWER_SUPPLY=y
63148
# CONFIG_HWMON is not set
@@ -69,22 +154,76 @@ CONFIG_USB_OHCI_HCD=y
69154
CONFIG_USB_OHCI_HCD_PLATFORM=y
70155
CONFIG_USB_STORAGE=y
71156
CONFIG_SOC_BRCMSTB=y
157+
CONFIG_MMC=y
158+
CONFIG_MMC_BLOCK_MINORS=16
159+
CONFIG_MMC_SDHCI=y
160+
CONFIG_MMC_SDHCI_PLTFM=y
72161
CONFIG_EXT4_FS=y
73162
CONFIG_EXT4_FS_POSIX_ACL=y
74163
CONFIG_EXT4_FS_SECURITY=y
75164
# CONFIG_DNOTIFY is not set
165+
CONFIG_PROC_KCORE=y
166+
CONFIG_CIFS=y
167+
CONFIG_JBD2_DEBUG=y
76168
CONFIG_FUSE_FS=y
169+
CONFIG_FHANDLE=y
170+
CONFIG_CGROUPS=y
171+
CONFIG_CUSE=y
172+
CONFIG_ISO9660_FS=y
173+
CONFIG_JOLIET=y
174+
CONFIG_ZISOFS=y
175+
CONFIG_UDF_FS=y
176+
CONFIG_MSDOS_FS=y
77177
CONFIG_VFAT_FS=y
78-
CONFIG_PROC_KCORE=y
79178
CONFIG_TMPFS=y
179+
CONFIG_JFFS2_FS=y
180+
CONFIG_UBIFS_FS=y
181+
CONFIG_SQUASHFS=y
182+
CONFIG_SQUASHFS_LZO=y
183+
CONFIG_SQUASHFS_XZ=y
80184
CONFIG_NFS_FS=y
81-
CONFIG_CIFS=y
185+
CONFIG_NFS_V3_ACL=y
186+
CONFIG_NFS_V4=y
187+
CONFIG_NFS_V4_1=y
188+
CONFIG_NFS_V4_2=y
189+
CONFIG_ROOT_NFS=y
82190
CONFIG_NLS_CODEPAGE_437=y
83-
CONFIG_NLS_ASCII=y
84191
CONFIG_NLS_ISO8859_1=y
85-
# CONFIG_CRYPTO_HW is not set
86192
CONFIG_PRINTK_TIME=y
193+
CONFIG_DYNAMIC_DEBUG=y
194+
# CONFIG_DEBUG_INFO is not set
195+
# CONFIG_DEBUG_INFO_REDUCED is not set
87196
CONFIG_DEBUG_FS=y
88197
CONFIG_MAGIC_SYSRQ=y
198+
CONFIG_LOCKUP_DETECTOR=y
199+
CONFIG_DEBUG_USER=y
89200
CONFIG_CMDLINE_BOOL=y
90201
CONFIG_CMDLINE="earlycon"
202+
# CONFIG_MIPS_CMDLINE_FROM_DTB is not set
203+
CONFIG_MIPS_CMDLINE_DTB_EXTEND=y
204+
# CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set
205+
# CONFIG_CRYPTO_HW is not set
206+
CONFIG_DT_BCM974XX=y
207+
CONFIG_FW_CFE=y
208+
CONFIG_ATA=y
209+
CONFIG_SATA_AHCI_PLATFORM=y
210+
CONFIG_AHCI_BRCMSTB=y
211+
CONFIG_GENERIC_PHY=y
212+
CONFIG_GPIOLIB=y
213+
CONFIG_GPIO_SYSFS=y
214+
CONFIG_PHY_BRCM_USB=y
215+
CONFIG_PHY_BRCM_SATA=y
216+
CONFIG_PM_RUNTIME=y
217+
CONFIG_PM_DEBUG=y
218+
CONFIG_SYSVIPC=y
219+
CONFIG_FUNCTION_GRAPH_TRACER=y
220+
CONFIG_DYNAMIC_FTRACE=y
221+
CONFIG_FUNCTION_TRACER=y
222+
CONFIG_FUNCTION_PROFILER=y
223+
CONFIG_IRQSOFF_TRACER=y
224+
CONFIG_SCHED_TRACER=y
225+
CONFIG_BLK_DEV_IO_TRACE=y
226+
CONFIG_FTRACE_SYSCALLS=y
227+
CONFIG_TRACER_SNAPSHOT=y
228+
CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
229+
CONFIG_STACK_TRACER=y

0 commit comments

Comments
 (0)