| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 1 May 2016 14:08:27 +0900 From: Yoshinori Sato <ysato@...rs.sourceforge.jp> To: linux-sh@...r.kernel.org, linux-kernel@...r.kernel.org Cc: Yoshinori Sato <ysato@...rs.sourceforge.jp> Subject: [PATCH RESEND 03/12] sh: Disable board specific code in OF mode Board specific code conflict on of-generic. Signed-off-by: Yoshinori Sato <ysato@...rs.sourceforge.jp> --- arch/sh/Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/sh/Makefile b/arch/sh/Makefile index bf5b3f5..8ff943b 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile @@ -130,6 +130,9 @@ head-y := arch/sh/kernel/head_$(BITS).o core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/ core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ +core-$(CONFIG_USE_BUILTIN_DTB) += arch/sh/boot/dts/ + +ifneq ($(CONFIG_SH_DEVICE_TREE),y) # Mach groups machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx @@ -150,6 +153,7 @@ machdir-$(CONFIG_SH_LANDISK) += mach-landisk machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 machdir-$(CONFIG_SH_CAYMAN) += mach-cayman machdir-$(CONFIG_SH_RSK) += mach-rsk +endif ifneq ($(machdir-y),) core-y += $(addprefix arch/sh/boards/, \ @@ -222,6 +226,13 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=arch/sh/kernel/vsyscall +%.dtb %.dtb.S %.dtb.o: | scripts + $(Q)$(MAKE) $(build)=arch/sh/boot/dts arch/sh/boot/dts/$@ + +PHONY += dtbs +dtbs: scripts + $(Q)$(MAKE) $(build)=arch/sh/boot/dts + define archhelp @echo ' zImage - Compressed kernel image' @echo ' romImage - Compressed ROM image, if supported' -- 2.7.0
Powered by blists - more mailing lists