summaryrefslogtreecommitdiff
path: root/scripts/Makefile.defconf
diff options
context:
space:
mode:
authorMaxime Ripard <mripard@kernel.org>2024-02-26 15:23:00 +0100
committerMaxime Ripard <mripard@kernel.org>2024-02-26 15:23:00 +0100
commit2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch)
tree75cd2329b7e737865bf28ea734a2e0649c02a5bf /scripts/Makefile.defconf
parent86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff)
parent72fa02fdf83306c52bc1eede28359e3fa32a151a (diff)
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch. Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'scripts/Makefile.defconf')
-rw-r--r--scripts/Makefile.defconf8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.defconf b/scripts/Makefile.defconf
index ab271b2051a2..226ea3df3b4b 100644
--- a/scripts/Makefile.defconf
+++ b/scripts/Makefile.defconf
@@ -9,8 +9,8 @@
# Input config fragments without '.config' suffix
define merge_into_defconfig
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
- -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
- $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
+ -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
+ $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef
@@ -23,7 +23,7 @@ endef
# Input config fragments without '.config' suffix
define merge_into_defconfig_override
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
- -Q -m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/$(1) \
- $(foreach config,$(2),$(srctree)/arch/$(ARCH)/configs/$(config).config)
+ -Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
+ $(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
endef