Commit 343ac722 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Move over the SH-5 entry.S. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 49e6c3e7

arch/sh/kernel/cpu/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -6,8 +6,14 @@ obj-$(CONFIG_CPU_SH2) = sh2/ 
obj-$(CONFIG_CPU_SH2A)		= sh2a/

obj-$(CONFIG_CPU_SH3)		= sh3/

obj-$(CONFIG_CPU_SH4)		= sh4/

obj-$(CONFIG_CPU_SH5)		= sh5/



# Special cases for family ancestry.



obj-$(CONFIG_CPU_SH4A)		+= sh4a/



# Common interfaces.



obj-$(CONFIG_UBC_WAKEUP)	+= ubc.o

obj-$(CONFIG_SH_ADC)		+= adc.o

arch/sh/kernel/cpu/sh5/Makefile

0 → 100644
+1 −0
Original line number Diff line number Diff line 
obj-y := entry.o

arch/sh64/kernel/entry.S→arch/sh/kernel/cpu/sh5/entry.S

+1 −3
Original line number Diff line number Diff line
@@ -10,12 +10,10 @@ 
 * Copyright (C) 2003, 2004 Richard Curnow

 *

 */



#include <linux/errno.h>

#include <linux/sys.h>



#include <asm/cpu/registers.h>

#include <asm/processor.h>

#include <asm/registers.h>

#include <asm/unistd.h>

#include <asm/thread_info.h>

#include <asm/asm-offsets.h>

include/asm-sh/processor.h

+12 −5
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#include <asm/cpu-features.h>



#ifndef __ASSEMBLY__



/*

 *  CPU type and hardware bug flags. Kept separately for each CPU.

 *
@@ -40,11 +42,8 @@ enum cpu_type { 
	CPU_SH_NONE

};



#ifdef CONFIG_SUPERH32

# include "processor_32.h"

#else

# include "processor_64.h"

#endif

/* Forward decl */

struct sh_cpuinfo;



/* arch/sh/kernel/setup.c */

const char *get_cpu_subtype(struct sh_cpuinfo *c);
@@ -55,4 +54,12 @@ int vsyscall_init(void); 
#define vsyscall_init() do { } while (0)

#endif



#endif /* __ASSEMBLY__ */



#ifdef CONFIG_SUPERH32

# include "processor_32.h"

#else

# include "processor_64.h"

#endif



#endif /* __ASM_SH_PROCESSOR_H */