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.autoconf | |
| 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.autoconf')
| -rw-r--r-- | scripts/Makefile.autoconf | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index c1eab2f3a1d..e3c88badb52 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -24,7 +24,9 @@ endif include include/config/auto.conf -include scripts/Kbuild.include +# include scripts/Kbuild.include +include scripts/Kbuild.uboot +include scripts/Makefile.compiler # Need to define CC and CPP again here in case the top Makefile did not # include config.mk. Some architectures expect CROSS_COMPILE to be defined @@ -36,7 +38,7 @@ include config.mk UBOOTINCLUDE := \ -Iinclude \ - $(if $(KBUILD_SRC), -I$(srctree)/include) \ + $(if $(building_out_of_srctree), -I$(srctree)/include) \ -I$(srctree)/arch/$(ARCH)/include \ -include $(srctree)/include/linux/kconfig.h @@ -129,14 +131,14 @@ include/config.h: scripts/Makefile.autoconf create_symlink FORCE PHONY += create_symlink create_symlink: ifdef CONFIG_CREATE_ARCH_SYMLINK -ifneq ($(KBUILD_SRC),) +ifdef building_out_of_srctree $(Q)mkdir -p include/asm - $(Q)if [ -d $(KBUILD_SRC)/arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \ + $(Q)if [ -d $(srctree)/arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \ dest=arch/$(ARCH)/mach-$(SOC)/include/mach; \ else \ dest=arch/$(ARCH)/include/asm/arch-$(if $(SOC),$(SOC),$(CPU)); \ fi; \ - ln -fsn $(KBUILD_SRC)/$$dest include/asm/arch + ln -fsn $(srctree)/$$dest include/asm/arch else $(Q)if [ -d arch/$(ARCH)/mach-$(SOC)/include/mach ]; then \ dest=../../mach-$(SOC)/include/mach; \ |