Skip to content

Commit 337b775

Browse files
MJNowakowskiralfbaechle
authored andcommitted
MIPS: generic: fix out-of-tree defconfig target builds
When specifying a generic defconfig target with O=... option set, make is invoked in the output location before a target makefile wrapper is created. Ensure that the correct makefile is used by specifying the kernel source makefile during make invocation. This fixes the either of the following errors: $ make sead3_defoncifg ARCH=mips O=test make[1]: Entering directory '/mnt/ssd/MIPS/linux-next/test' make[2]: *** No rule to make target '32r2el_defconfig'. Stop. arch/mips/Makefile:506: recipe for target 'sead3_defconfig' failed make[1]: *** [sead3_defconfig] Error 2 make[1]: Leaving directory '/mnt/ssd/MIPS/linux-next/test' Makefile:152: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 $ make 32r2el_defconfig ARCH=mips O=test make[1]: Entering directory '/mnt/ssd/MIPS/linux-next/test' Using ../arch/mips/configs/generic_defconfig as base Merging ../arch/mips/configs/generic/32r2.config Merging ../arch/mips/configs/generic/el.config Merging ../arch/mips/configs/generic/board-sead-3.config ! ! merged configuration written to .config (needs make) ! make[2]: *** No rule to make target 'olddefconfig'. Stop. arch/mips/Makefile:489: recipe for target '32r2el_defconfig' failed make[1]: *** [32r2el_defconfig] Error 2 make[1]: Leaving directory '/mnt/ssd/MIPS/linux-next/test' Makefile:152: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Fixes: eed0eab ('MIPS: generic: Introduce generic DT-based board support') Fixes: 3f5f0a4 ('MIPS: generic: Convert SEAD-3 to a generic board') Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15464/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
1 parent 9d7f29c commit 337b775

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/mips/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ $(generic_defconfigs):
489489
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
490490
-m -O $(objtree) $(srctree)/arch/$(ARCH)/configs/generic_defconfig $^ \
491491
$(foreach board,$(BOARDS),$(generic_config_dir)/board-$(board).config)
492-
$(Q)$(MAKE) olddefconfig
492+
$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
493493

494494
#
495495
# Prevent generic merge_config rules attempting to merge single fragments
@@ -503,8 +503,8 @@ $(generic_config_dir)/%.config: ;
503503
#
504504
.PHONY: sead3_defconfig
505505
sead3_defconfig:
506-
$(Q)$(MAKE) 32r2el_defconfig BOARDS=sead-3
506+
$(Q)$(MAKE) -f $(srctree)/Makefile 32r2el_defconfig BOARDS=sead-3
507507

508508
.PHONY: sead3micro_defconfig
509509
sead3micro_defconfig:
510-
$(Q)$(MAKE) micro32r2el_defconfig BOARDS=sead-3
510+
$(Q)$(MAKE) -f $(srctree)/Makefile micro32r2el_defconfig BOARDS=sead-3

0 commit comments

Comments
 (0)