Skip to content

Commit bd3f9ee

Browse files
Sughosh Ganutrini
authored andcommitted
kbuild: Bump the build system to 6.1
Our last sync with the kernel was 5.1. We are so out of sync now, that tracking the patches and backporting them one by one makes little sense and it's going to take ages. This is an attempt to sync up Makefiles to 6.1. Unfortunately due to sheer amount of patches this is not easy to review, but that's what we decided during a community call for the bump to 5.1, so we are following the same guidelines here. Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>a #rebased on -next
1 parent 56ae3c2 commit bd3f9ee

41 files changed

Lines changed: 1052 additions & 943 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Kbuild

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77

88
generic-offsets-file := include/generated/generic-asm-offsets.h
99

10-
always := $(generic-offsets-file)
10+
always-y := $(generic-offsets-file)
1111
targets := lib/asm-offsets.s
1212

13-
CFLAGS_REMOVE_asm-offsets.o := $(LTO_CFLAGS)
13+
CFLAGS_REMOVE_lib/asm-offsets.o := $(LTO_CFLAGS)
14+
CFLAGS_REMOVE_arch/$(ARCH)/lib/asm-offsets.o := $(LTO_CFLAGS)
1415

1516
$(obj)/$(generic-offsets-file): $(obj)/lib/asm-offsets.s FORCE
1617
$(call filechk,offsets,__GENERIC_ASM_OFFSETS_H__)
@@ -22,10 +23,11 @@ ifneq ($(wildcard $(srctree)/arch/$(ARCH)/lib/asm-offsets.c),)
2223
offsets-file := include/generated/asm-offsets.h
2324
endif
2425

25-
always += $(offsets-file)
26+
always-y += $(offsets-file)
2627
targets += arch/$(ARCH)/lib/asm-offsets.s
2728

28-
CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY
29+
CFLAGS_lib/asm-offsets.o := -DDO_DEPS_ONLY
30+
CFLAGS_arch/$(ARCH)/lib/asm-offsets.o := -DDO_DEPS_ONLY
2931

3032
$(obj)/$(offsets-file): $(obj)/arch/$(ARCH)/lib/asm-offsets.s FORCE
3133
$(call filechk,offsets,__ASM_OFFSETS_H__)

0 commit comments

Comments
 (0)