diff options
| author | Sughosh Ganu <[email protected]> | 2025-12-16 11:16:24 +0200 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-01-02 10:28:14 -0600 |
| commit | bd3f9ee679b4d1456d0d3c261ab76788950e6096 (patch) | |
| tree | a50e5ddfb4b5116903ad59753af910a76874705e /scripts/Makefile.xpl | |
| parent | 56ae3c2a44fcd8e2f680c51620011273727ae9db (diff) | |
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 <[email protected]>
Signed-off-by: Ilias Apalodimas <[email protected]>a #rebased on -next
Diffstat (limited to 'scripts/Makefile.xpl')
| -rw-r--r-- | scripts/Makefile.xpl | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl index 52f014ad332..5e65d7b2498 100644 --- a/scripts/Makefile.xpl +++ b/scripts/Makefile.xpl @@ -17,7 +17,9 @@ src := $(obj) # Create output directory if not already present _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) -include $(srctree)/scripts/Kbuild.include +include $(srctree)/scripts/Kbuild.uboot + +include scripts/Makefile.compiler -include include/config/auto.conf @@ -363,7 +365,7 @@ cmd_dtoc = $(DTOC_ARGS) -c $(obj)/dts -C include/generated all quiet_cmd_plat = PLAT $@ cmd_plat = $(CC) $(c_flags) -c $< -o $(filter-out $(PHONY),$@) -$(obj)/dts/dt-%.o: $(obj)/dts/dt-%.c $(platdata-hdr) +$(obj)/dts/dt-%.o: $(obj)/dts/dt-%.c $(platdata-hdr) FORCE $(call if_changed,plat) # Don't use dts_dir here, since it forces running this expensive rule every time @@ -461,7 +463,7 @@ cmd_sunxi_spl_image_builder = $(objtree)/tools/sunxi-spl-image-builder \ -u $(CONFIG_NAND_SUNXI_SPL_USABLE_PAGE_SIZE) \ -e $(CONFIG_SYS_NAND_BLOCK_SIZE) \ -s -b $< $@ -$(obj)/sunxi-spl-with-ecc.bin: $(obj)/sunxi-spl.bin +$(obj)/sunxi-spl-with-ecc.bin: $(obj)/sunxi-spl.bin FORCE $(call if_changed,sunxi_spl_image_builder) @@ -493,9 +495,9 @@ quiet_cmd_keep_syms_lto_cc = KSLCC $@ cmd_keep_syms_lto_cc = \ $(CC) $(filter-out $(LTO_CFLAGS),$(c_flags)) -c -o $@ $< -$(u-boot-spl-keep-syms-lto_c): $(u-boot-spl-main) $(u-boot-spl-platdata) +$(u-boot-spl-keep-syms-lto_c): $(u-boot-spl-main) $(u-boot-spl-platdata) FORCE $(call if_changed,keep_syms_lto) -$(u-boot-spl-keep-syms-lto): $(u-boot-spl-keep-syms-lto_c) +$(u-boot-spl-keep-syms-lto): $(u-boot-spl-keep-syms-lto_c) FORCE $(call if_changed,keep_syms_lto_cc) else u-boot-spl-keep-syms-lto := @@ -545,11 +547,11 @@ $(sort $(u-boot-spl-init) $(u-boot-spl-main)): $(u-boot-spl-dirs) ; PHONY += $(u-boot-spl-dirs) $(u-boot-spl-dirs): $(u-boot-spl-platdata) prepare - $(Q)$(MAKE) $(build)=$@ + $(Q)$(MAKE) $(build)=$@ need-builtin=1 PHONY += prepare prepare: - $(Q)$(MAKE) $(build)=$(obj)/. + $(Q)$(MAKE) $(build)=$(obj)/. need-builtin=1 quiet_cmd_cpp_lds = LDS $@ cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ @@ -572,7 +574,7 @@ PHONY += FORCE FORCE: $(obj)/dts/dt-$(SPL_NAME).dtb: dts/dt.dtb - $(Q)$(MAKE) $(build)=$(obj)/dts spl_dtbs + $(Q)$(MAKE) $(build)=$(obj)/dts spl_dtbs need-builtin=1 ifeq ($(CONFIG_OF_UPSTREAM),y) ifeq ($(CONFIG_ARM64),y) @@ -594,7 +596,7 @@ $(sort $(dir $(SHRUNK_ARCH_DTB))): $(shell [ -d $@ ] || mkdir -p $@) .SECONDEXPANSION: -$(SHRUNK_ARCH_DTB): $$(patsubst $(obj)/dts/%, $(dt_dir)/%, $$@) $(dir $(SHRUNK_ARCH_DTB)) +$(SHRUNK_ARCH_DTB): $$(patsubst $(obj)/dts/%, $(dt_dir)/%, $$@) $(dir $(SHRUNK_ARCH_DTB)) FORCE $(call if_changed,fdtgrep) targets += $(SPL_OF_LIST_TARGETS) |