@@ -64,10 +64,10 @@ config SUPERH
select MODULES_USE_ELF_RELA
select NEED_SG_DMA_LENGTH
select NO_DMA if !MMU && !DMA_COHERENT
- select NO_GENERIC_PCI_IOPORT_MAP if PCI
+ select NO_GENERIC_PCI_IOPORT_MAP if !SH_DEVICE_TREE
select OLD_SIGACTION
select OLD_SIGSUSPEND
- select PCI_DOMAINS if PCI
+ select PCI_DOMAINS if PCI && !SH_DEVICE_TREE
select PERF_EVENTS
select PERF_USE_VMALLOC
select RTC_LIB
@@ -363,14 +363,17 @@ config CPU_SUBTYPE_SH7091
config CPU_SUBTYPE_SH7750R
bool "Support SH7750R processor"
select CPU_SH4
+ select COMMON_CLK_SH7750 if COMMMON_CLK
config CPU_SUBTYPE_SH7750S
bool "Support SH7750S processor"
select CPU_SH4
+ select COMMON_CLK_SH7750 if COMMMON_CLK
config CPU_SUBTYPE_SH7751
bool "Support SH7751 processor"
select CPU_SH4
+ select COMMON_CLK_SH7750 if COMMMON_CLK
help
Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
or if you have a HD6417751R CPU.
@@ -378,6 +381,8 @@ config CPU_SUBTYPE_SH7751
config CPU_SUBTYPE_SH7751R
bool "Support SH7751R processor"
select CPU_SH4
+ select COMMON_CLK_SH7750 if COMMMON_CLK
+ select PCI_SH7751 if SH_DEVICE_TREE
config CPU_SUBTYPE_SH7760
bool "Support SH7760 processor"
@@ -702,7 +707,7 @@ config BUILTIN_DTB_SOURCE
config ZERO_PAGE_OFFSET
hex
default "0x00010000" if PAGE_SIZE_64KB || SH_RTS7751R2D || \
- SH_7751_SOLUTION_ENGINE
+ SH_7751_SOLUTION_ENGINE || SH_RTS7751R2D_OF
default "0x00004000" if PAGE_SIZE_16KB || SH_SH03
default "0x00002000" if PAGE_SIZE_8KB
default "0x00001000"
@@ -744,6 +749,7 @@ config ROMIMAGE_MMCIF
choice
prompt "Kernel command line"
optional
+ depends on !SH_DEVICE_TREE
default CMDLINE_OVERWRITE
help
Setting this option allows the kernel command line arguments
@@ -16,9 +16,14 @@ config SH_DEVICE_TREE
bool
select OF
select OF_EARLY_FLATTREE
+ select OF_ADDRESS
select TIMER_OF
select COMMON_CLK
select GENERIC_CALIBRATE_DELAY
+ select GENERIC_IOMAP
+ select GENERIC_IRQ_CHIP
+ select SYS_SUPPORTS_PCI
+ select GENERIC_PCI_IOMAP if PCI
config SH_JCORE_SOC
bool "J-Core SoC"
@@ -161,6 +166,17 @@ config SH_RTS7751R2D
Select RTS7751R2D if configuring for a Renesas Technology
Sales SH-Graphics board.
+config SH_RTS7751R2D_OF
+ bool "RTS7751R2D (DeviceTree)"
+ depends on CPU_SUBTYPE_SH7751R
+ select HAVE_PCI
+ select IO_TRAPPED if MMU
+ select SH_DEVICE_TREE
+ select COMMON_CLK
+ help
+ Select RTS7751R2D if configuring for a Renesas Technology
+ Sales SH-Graphics board. (Use DeviceTree)
+
config SH_RSK
bool "Renesas Starter Kit"
depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \
@@ -300,8 +316,20 @@ config SH_LANDISK
bool "LANDISK"
depends on CPU_SUBTYPE_SH7751R
select HAVE_PCI
+ select SYS_SUPPORTS_PCI
+ help
+ I-O DATA DEVICE, INC. "LANDISK Series" support.
+
+config SH_LANDISK_OF
+ bool "LANDISK (DeviceTree)"
+ depends on CPU_SUBTYPE_SH7751R
+ select HAVE_PCI
+ select SYS_SUPPORTS_PCI
+ select SH_DEVICE_TREE
+ select COMMON_CLK
help
I-O DATA DEVICE, INC. "LANDISK Series" support.
+ Use Device Tree.
config SH_TITAN
bool "TITAN"
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- arch/sh/Kconfig | 12 +++++++++--- arch/sh/boards/Kconfig | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)