1
0
Fork 0
alistair23-linux/arch/sh
Masahiro Yamada 207a369e3c sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE
I fixed a similar build error in commit 1b1e4ee86e ("sh: fix build
error for empty CONFIG_BUILTIN_DTB_SOURCE"), but it came back again.

Since commit 37c8a5fafa ("kbuild: consolidate Devicetree dtb
build rules"), the combination of CONFIG_OF_EARLY_FLATTREE=y and
CONFIG_USE_BUILTIN_DTB=n results in the following build error:

  make[1]: *** No rule to make target 'arch/sh/boot/dts/.dtb.o',
  needed by 'arch/sh/boot/dts/built-in.a'.  Stop.

Prior to that commit, there was only one path to descend into
arch/sh/boot/dts/, and arch/sh/Makefile correctly guards it with
CONFIG_USE_BUILTIN_DTB:

  core-$(CONFIG_USE_BUILTIN_DTB)  += arch/sh/boot/dts/

Now, there is another path to descend there from the top Makefile
when CONFIG_OF_EARLY_FLATTREE=y. If CONFIG_USE_BUILTIN_DTB is disabled,
CONFIG_BUILTIN_DTB_SOURCE is invisible instead of defined as "".

Add obj-$(CONFIG_USE_BUILTIN_DTB) guard to avoid the attempt to build
the non-existing file.

Fixes: 37c8a5fafa ("kbuild: consolidate Devicetree dtb build rules")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2019-02-13 23:29:42 +09:00
..
boards Kconfig file consolidation for v4.21 2018-12-29 13:40:29 -08:00
boot sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE 2019-02-13 23:29:42 +09:00
cchips License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
configs sh: sh03: rtc: push down rtc class ops into driver 2018-12-18 16:13:04 +01:00
drivers sh: drivers: convert to SPDX identifiers 2018-12-28 12:11:44 -08:00
include Kbuild late updates for v4.21 2019-01-06 16:33:10 -08:00
kernel It appears that the zero-day bot did find a bug in my sh build. 2019-01-05 14:08:00 -08:00
lib sh: lib: convert to SPDX identifiers 2018-12-28 12:11:45 -08:00
lib64 License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
math-emu signal/sh: Use force_sig_fault where appropriate 2018-04-25 10:44:09 -05:00
mm Remove 'type' argument from access_ok() function 2019-01-03 18:57:57 -08:00
oprofile Remove 'type' argument from access_ok() function 2019-01-03 18:57:57 -08:00
tools kbuild: remove redundant target cleaning on failure 2019-01-06 09:46:51 +09:00
Kconfig Kconfig file consolidation for v4.21 2018-12-29 13:40:29 -08:00
Kconfig.cpu License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig.debug Kconfig: consolidate the "Kernel hacking" menu 2018-08-02 08:06:48 +09:00
Makefile sh: generate uapi header and syscall table header files 2018-12-19 17:54:40 +01:00