Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1433782

[PATCH v4 08/22] sh: Disable board specific code on device tree mode

From Yoshinori Sato <ysato@users.sourceforge.jp>
Newsgroups linux.kernel
Subject [PATCH v4 08/22] sh: Disable board specific code on device tree mode
Date 2016-06-29 16:10 +0200
Message-ID <rPolJ-5aS-53@gated-at.bofh.it> (permalink)
References <rPo2m-4Od-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Changes v4
none

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 arch/sh/Makefile                | 2 ++
 arch/sh/kernel/cpu/sh4/Makefile | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 3b2c8b4..8adffa8 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -132,6 +132,7 @@ 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
@@ -152,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/, \
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index 3a1dbc7..b822c0c 100644
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -14,6 +14,7 @@ perf-$(CONFIG_CPU_SUBTYPE_SH7750)	:= perf_event.o
 perf-$(CONFIG_CPU_SUBTYPE_SH7750S)	:= perf_event.o
 perf-$(CONFIG_CPU_SUBTYPE_SH7091)	:= perf_event.o
 
+ifndef CONFIG_OF
 # CPU subtype setup
 obj-$(CONFIG_CPU_SUBTYPE_SH7750)	+= setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7750R)	+= setup-sh7750.o
@@ -31,6 +32,7 @@ endif
 
 # Additional clocks by subtype
 clock-$(CONFIG_CPU_SUBTYPE_SH4_202)	+= clock-sh4-202.o
+endif
 
 obj-y					+= $(clock-y)
 obj-$(CONFIG_PERF_EVENTS)		+= $(perf-y)
-- 
2.7.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v4 00/22] sh: LANDISK and R2Dplus convert to device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:00 +0200
  [PATCH v4 15/22] sh: Move common PCI stuff to arch/sh/kernel Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 04/22] sh: Use P1SEGADDR Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 13/22] sh: irqchip: SH7751 IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Arnd Bergmann <arnd@arndb.de> - 2016-06-29 17:00 +0200
      Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 17:00 +0200
    Re: [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Rob Herring <robh@kernel.org> - 2016-07-01 03:50 +0200
  [PATCH v4 07/22] sh: Passing FDT address on zImage Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 18/22] sh: Add separate DTB build rule Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 09/22] sh: Use GENERIC_IOMAP on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 20/22] sh: IO-DATA HDL-U (a,k.a landisk) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus)  DeviceTree Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-06-29 16:20 +0200
      Re: [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-30 16:50 +0200
  [PATCH v4 17/22] pci: PCI_HOST_GENERIC enable for SH Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 05/22] sh: command line passing chosen/bootargs in devicetree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 16/22] pci: pci_config_window move to linux/pci.h Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 08/22] sh: Disable board specific code on device tree mode Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-01 11:00 +0200
      Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
    Re: [PATCH v4 14/22] sh: SH7751 core dtsi Geert Uytterhoeven <geert@linux-m68k.org> - 2016-07-04 09:20 +0200
      Re: [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-04 18:20 +0200
  [PATCH v4 03/22] sh: set preset_lpj Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
  [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200
    Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus)  IRQCHIP Driver Rob Herring <robh@kernel.org> - 2016-07-01 04:10 +0200
      Re: [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-07-03 13:40 +0200
  [PATCH v4 02/22] sh: More early unflatten device tree Yoshinori Sato <ysato@users.sourceforge.jp> - 2016-06-29 16:10 +0200

csiph-web