diff options
author | Michal Simek <monstr@monstr.eu> | 2009-07-30 08:31:23 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2009-09-21 08:29:21 -0400 |
commit | 2622434ee0108c65808a63f067e72d0bbc75b372 (patch) | |
tree | c6f89cd62d636bbdc6e96c589481d79b7b67c3da /arch/microblaze/kernel/setup.c | |
parent | 8cc11f5ab5384dad6c63905f71882e65cd70b7b7 (diff) |
microblaze: Add checking mechanism for MSR instruction
It was necessary to use fourth parameter(r8) in early_printk
to show messages on console.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/setup.c')
-rw-r--r-- | arch/microblaze/kernel/setup.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 2a97bf513b64..8c1e0f4dcf18 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
@@ -94,7 +94,7 @@ inline unsigned get_romfs_len(unsigned *addr) | |||
94 | #endif /* CONFIG_MTD_UCLINUX_EBSS */ | 94 | #endif /* CONFIG_MTD_UCLINUX_EBSS */ |
95 | 95 | ||
96 | void __init machine_early_init(const char *cmdline, unsigned int ram, | 96 | void __init machine_early_init(const char *cmdline, unsigned int ram, |
97 | unsigned int fdt) | 97 | unsigned int fdt, unsigned int msr) |
98 | { | 98 | { |
99 | unsigned long *src, *dst = (unsigned long *)0x0; | 99 | unsigned long *src, *dst = (unsigned long *)0x0; |
100 | 100 | ||
@@ -157,6 +157,16 @@ void __init machine_early_init(const char *cmdline, unsigned int ram, | |||
157 | early_printk("New klimit: 0x%08x\n", (unsigned)klimit); | 157 | early_printk("New klimit: 0x%08x\n", (unsigned)klimit); |
158 | #endif | 158 | #endif |
159 | 159 | ||
160 | #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR | ||
161 | if (msr) | ||
162 | early_printk("!!!Your kernel has setup MSR instruction but " | ||
163 | "CPU don't have it %d\n", msr); | ||
164 | #else | ||
165 | if (!msr) | ||
166 | early_printk("!!!Your kernel not setup MSR instruction but " | ||
167 | "CPU have it %d\n", msr); | ||
168 | #endif | ||
169 | |||
160 | for (src = __ivt_start; src < __ivt_end; src++, dst++) | 170 | for (src = __ivt_start; src < __ivt_end; src++, dst++) |
161 | *dst = *src; | 171 | *dst = *src; |
162 | 172 | ||