Commit 6424db52 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' into sh/hw-breakpoints 

Conflict between FPU thread flag migration and debug
thread flag addition.

Conflicts:
	arch/sh/include/asm/thread_info.h
	arch/sh/include/asm/ubc.h
	arch/sh/kernel/process_32.c
parents 09a07294 6a5a0b91

arch/sh/Kconfig

+17 −12
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ config SUPERH 
	select HAVE_IOREMAP_PROT if MMU

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA
@@ -37,6 +39,7 @@ config SUPERH32 
	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_ARCH_KGDB

	select HAVE_HW_BREAKPOINT if CPU_SH4A
@@ -171,6 +174,12 @@ config ARCH_HAS_CPU_IDLE_WAIT 
config IO_TRAPPED

	bool



config DMA_COHERENT

	bool



config DMA_NONCOHERENT

	def_bool !DMA_COHERENT



source "init/Kconfig"



source "kernel/Kconfig.freezer"
@@ -221,6 +230,7 @@ config CPU_SHX2 


config CPU_SHX3

	bool

	select DMA_COHERENT



config ARCH_SHMOBILE

	bool
@@ -762,17 +772,6 @@ config ENTRY_OFFSET 
	default "0x00010000" if PAGE_SIZE_64KB

	default "0x00000000"



config UBC_WAKEUP

	bool "Wakeup UBC on startup"

	depends on CPU_SH4 && !CPU_SH4A

	help

	  Selecting this option will wakeup the User Break Controller (UBC) on

	  startup. Although the UBC is left in an awake state when the processor

	  comes up, some boot loaders misbehave by putting the UBC to sleep in a

	  power saving state, which causes issues with things like ptrace().



	  If unsure, say N.



choice

	prompt "Kernel command line"

	optional
@@ -819,7 +818,13 @@ config MAPLE 
	 Dreamcast with a serial line terminal or a remote network

	 connection.



source "arch/sh/drivers/pci/Kconfig"

config PCI

	bool "PCI support"

	depends on SYS_SUPPORTS_PCI

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

	  your box. If you have PCI, say Y, otherwise N.



source "drivers/pci/pcie/Kconfig"

arch/sh/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ defaultimage-$(CONFIG_SUPERH32) := zImage 
defaultimage-$(CONFIG_SH_SH7785LCR)		:= uImage

defaultimage-$(CONFIG_SH_RSK)			:= uImage

defaultimage-$(CONFIG_SH_URQUELL)		:= uImage

defaultimage-$(CONFIG_SH_MIGOR)			:= uImage

defaultimage-$(CONFIG_SH_AP325RXA)		:= uImage

defaultimage-$(CONFIG_SH_7724_SOLUTION_ENGINE)	:= uImage

defaultimage-$(CONFIG_SH_7206_SOLUTION_ENGINE)	:= vmlinux

defaultimage-$(CONFIG_SH_7619_SOLUTION_ENGINE)	:= vmlinux
@@ -136,6 +139,7 @@ machdir-$(CONFIG_SH_7751_SYSTEMH) += mach-systemh 
machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705

machdir-$(CONFIG_SH_HIGHLANDER)			+= mach-highlander

machdir-$(CONFIG_SH_MIGOR)			+= mach-migor

machdir-$(CONFIG_SH_AP325RXA)			+= mach-ap325rxa

machdir-$(CONFIG_SH_KFR2R09)			+= mach-kfr2r09

machdir-$(CONFIG_SH_ECOVEC)			+= mach-ecovec24

machdir-$(CONFIG_SH_SDK7780)			+= mach-sdk7780

arch/sh/boards/Makefile

+0 −1
Original line number Diff line number Diff line 
#

# Specific board support, not covered by a mach group.

#

obj-$(CONFIG_SH_AP325RXA)	+= board-ap325rxa.o

obj-$(CONFIG_SH_MAGIC_PANEL_R2)	+= board-magicpanelr2.o

obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o

obj-$(CONFIG_SH_URQUELL)	+= board-urquell.o

arch/sh/boards/mach-ap325rxa/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-y	 := setup.o sdram.o

arch/sh/boards/mach-ap325rxa/sdram.S

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * AP325RXA sdram self/auto-refresh setup code

 *

 *  Copyright (C) 2009 Magnus Damm

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#include <linux/sys.h>

#include <linux/errno.h>

#include <linux/linkage.h>

#include <asm/asm-offsets.h>

#include <asm/suspend.h>

#include <asm/romimage-macros.h>



/* code to enter and leave self-refresh. must be self-contained.

 * this code will be copied to on-chip memory and executed from there.

 */

	.balign 4

ENTRY(ap325rxa_sdram_enter_start)



	/* SBSC: disable power down and put in self-refresh mode */

	mov.l	1f, r4

	mov.l	2f, r1

	mov.l	@r4, r2

	or	r1, r2

	mov.l   3f, r3

	and	r3, r2

	mov.l	r2, @r4



	rts

	 nop



	.balign 4

1:	.long	0xfe400008 /* SDCR0 */

2:	.long	0x00000400

3:	.long	0xffff7fff

ENTRY(ap325rxa_sdram_enter_end)



	.balign 4

ENTRY(ap325rxa_sdram_leave_start)



	/* SBSC: set auto-refresh mode */

	mov.l	1f, r4

	mov.l	@r4, r0

	mov.l   4f, r1

	and	r1, r0

	mov.l	r0, @r4

	mov.l	6f, r4

	mov.l	8f, r0

	mov.l	@r4, r1

	mov	#-1, r4

	add	r4, r1

	or	r1, r0

	mov.l	7f, r1

	mov.l	r0, @r1



	rts

	 nop



	.balign 4

1:	.long	0xfe400008 /* SDCR0 */

4:	.long	0xfffffbff

6:	.long   0xfe40001c /* RTCOR */

7:	.long   0xfe400018 /* RTCNT */

8:	.long   0xa55a0000

ENTRY(ap325rxa_sdram_leave_end)

CRA Git | Maintained and supported by SUSTech CRA and CCSE