diff options
author | David Howells <dhowells@redhat.com> | 2008-02-08 07:19:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:30 -0500 |
commit | b920de1b77b72ca9432ac3f97edb26541e65e5dd (patch) | |
tree | 40fa9be1470e929c47927dea7eddf184c0204229 /include/linux | |
parent | ef3d534754f31fed9c3b976fee1ece1b3bc38282 (diff) |
mn10300: add the MN10300/AM33 architecture to the kernel
Add architecture support for the MN10300/AM33 CPUs produced by MEI to the
kernel.
This patch also adds board support for the ASB2303 with the ASB2308 daughter
board, and the ASB2305. The only processor supported is the MN103E010, which
is an AM33v2 core plus on-chip devices.
[akpm@linux-foundation.org: nuke cvs control strings]
Signed-off-by: Masakazu Urade <urade.masakazu@jp.panasonic.com>
Signed-off-by: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/elf-em.h | 3 | ||||
-rw-r--r-- | include/linux/kernel.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h index 5834e843a946..18bea78fe47b 100644 --- a/include/linux/elf-em.h +++ b/include/linux/elf-em.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define EM_V850 87 /* NEC v850 */ | 31 | #define EM_V850 87 /* NEC v850 */ |
32 | #define EM_M32R 88 /* Renesas M32R */ | 32 | #define EM_M32R 88 /* Renesas M32R */ |
33 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ | 33 | #define EM_H8_300 46 /* Renesas H8/300,300H,H8S */ |
34 | #define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */ | ||
34 | #define EM_BLACKFIN 106 /* ADI Blackfin Processor */ | 35 | #define EM_BLACKFIN 106 /* ADI Blackfin Processor */ |
35 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ | 36 | #define EM_FRV 0x5441 /* Fujitsu FR-V */ |
36 | #define EM_AVR32 0x18ad /* Atmel AVR32 */ | 37 | #define EM_AVR32 0x18ad /* Atmel AVR32 */ |
@@ -47,6 +48,8 @@ | |||
47 | #define EM_CYGNUS_M32R 0x9041 | 48 | #define EM_CYGNUS_M32R 0x9041 |
48 | /* This is the old interim value for S/390 architecture */ | 49 | /* This is the old interim value for S/390 architecture */ |
49 | #define EM_S390_OLD 0xA390 | 50 | #define EM_S390_OLD 0xA390 |
51 | /* Also Panasonic/MEI MN10300, AM33 */ | ||
52 | #define EM_CYGNUS_MN10300 0xbeef | ||
50 | 53 | ||
51 | 54 | ||
52 | #endif /* _LINUX_ELF_EM_H */ | 55 | #endif /* _LINUX_ELF_EM_H */ |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 568042290c0b..3344185dd3b2 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -222,6 +222,7 @@ extern int panic_on_unrecovered_nmi; | |||
222 | extern int tainted; | 222 | extern int tainted; |
223 | extern const char *print_tainted(void); | 223 | extern const char *print_tainted(void); |
224 | extern void add_taint(unsigned); | 224 | extern void add_taint(unsigned); |
225 | extern int root_mountflags; | ||
225 | 226 | ||
226 | /* Values used for system_state */ | 227 | /* Values used for system_state */ |
227 | extern enum system_states { | 228 | extern enum system_states { |