Skip to content

Commit 6a30235

Browse files
author
Linus Torvalds
committed
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23: sh: Fix fs.h removal from mm.h regressions. sh: fix get_wchan() for SH kernels without framepointers sh: arch/sh/boot - fix shell usage rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts. sh: remove support for sh7300 and solution engine 7300 sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies. sh: Kill off virt_to_bus()/bus_to_virt(). sh: sh-sci - fix SH7708 support sh: Restrict DSP support to specific CPUs. sh: Silence sq compile warning on sh4 nommu. sh: Kill the rest of the SE73180 cruft. sh: remove support for sh73180 and solution engine 73180 sh: remove old broken pint code sh: Reclaim beginning of P3 space for vmalloc area. sh: Fix Dreamcast DMA issues. sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.
2 parents 8e268f3 + e06c4e5 commit 6a30235

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+138
-2964
lines changed

arch/sh/Kconfig

+10-23
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ config ARCH_HAS_ILOG2_U64
9090
bool
9191
default n
9292

93+
config ARCH_NO_VIRT_TO_BUS
94+
def_bool y
95+
9396
source "init/Kconfig"
9497

9598
menu "System type"
@@ -134,8 +137,8 @@ config SH_FPU_EMU
134137

135138
config SH_DSP
136139
bool "DSP support"
137-
default y if SH4AL_DSP || !CPU_SH4
138-
default n
140+
depends on CPU_HAS_DSP
141+
default y
139142
help
140143
Selecting this option will enable support for SH processors that
141144
have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
@@ -172,9 +175,6 @@ config SPECULATIVE_EXECUTION
172175
config CPU_HAS_INTEVT
173176
bool
174177

175-
config CPU_HAS_PINT_IRQ
176-
bool
177-
178178
config CPU_HAS_MASKREG_IRQ
179179
bool
180180

@@ -202,6 +202,9 @@ config CPU_HAS_SR_RB
202202
config CPU_HAS_PTEA
203203
bool
204204

205+
config CPU_HAS_DSP
206+
bool
207+
205208
endmenu
206209

207210
menu "Board support"
@@ -261,14 +264,6 @@ config SH_7780_SOLUTION_ENGINE
261264
Select 7780 SolutionEngine if configuring for a Renesas SH7780
262265
evaluation board.
263266

264-
config SH_7300_SOLUTION_ENGINE
265-
bool "SolutionEngine7300"
266-
select SOLUTION_ENGINE
267-
depends on CPU_SUBTYPE_SH7300
268-
help
269-
Select 7300 SolutionEngine if configuring for a Hitachi
270-
SH7300(SH-Mobile V) evaluation board.
271-
272267
config SH_7343_SOLUTION_ENGINE
273268
bool "SolutionEngine7343"
274269
select SOLUTION_ENGINE
@@ -277,14 +272,6 @@ config SH_7343_SOLUTION_ENGINE
277272
Select 7343 SolutionEngine if configuring for a Hitachi
278273
SH7343 (SH-Mobile 3AS) evaluation board.
279274

280-
config SH_73180_SOLUTION_ENGINE
281-
bool "SolutionEngine73180"
282-
select SOLUTION_ENGINE
283-
depends on CPU_SUBTYPE_SH73180
284-
help
285-
Select 73180 SolutionEngine if configuring for a Hitachi
286-
SH73180(SH-Mobile 3) evaluation board.
287-
288275
config SH_7751_SYSTEMH
289276
bool "SystemH7751R"
290277
depends on CPU_SUBTYPE_SH7751R
@@ -448,10 +435,10 @@ config SH_TIMER_IRQ
448435

449436
config SH_PCLK_FREQ
450437
int "Peripheral clock frequency (in Hz)"
451-
default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343
438+
default "27000000" if CPU_SUBTYPE_SH7343
452439
default "31250000" if CPU_SUBTYPE_SH7619
453440
default "32000000" if CPU_SUBTYPE_SH7722
454-
default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \
441+
default "33333333" if CPU_SUBTYPE_SH7770 || \
455442
CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
456443
CPU_SUBTYPE_SH7206
457444
default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R

arch/sh/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ machdir-$(CONFIG_SH_SOLUTION_ENGINE) += se/770x
9191
machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE) += se/7722
9292
machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) += se/7751
9393
machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE) += se/7780
94-
machdir-$(CONFIG_SH_7300_SOLUTION_ENGINE) += se/7300
9594
machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE) += se/7343
96-
machdir-$(CONFIG_SH_73180_SOLUTION_ENGINE) += se/73180
9795
machdir-$(CONFIG_SH_HP6XX) += hp6xx
9896
machdir-$(CONFIG_SH_DREAMCAST) += dreamcast
9997
machdir-$(CONFIG_SH_MPC1211) += mpc1211

arch/sh/boards/se/7300/Makefile

-5
This file was deleted.

arch/sh/boards/se/7300/io.c

-268
This file was deleted.

0 commit comments

Comments
 (0)