diff options
Diffstat (limited to 'arch/m32r/kernel/setup.c')
-rw-r--r-- | arch/m32r/kernel/setup.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index f722ec8eb021..c2e4dccf0112 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
@@ -320,6 +320,9 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
320 | #elif defined(CONFIG_CHIP_MP) | 320 | #elif defined(CONFIG_CHIP_MP) |
321 | seq_printf(m, "cpu family\t: M32R-MP\n" | 321 | seq_printf(m, "cpu family\t: M32R-MP\n" |
322 | "cache size\t: I-xxKB/D-xxKB\n"); | 322 | "cache size\t: I-xxKB/D-xxKB\n"); |
323 | #elif defined(CONFIG_CHIP_M32104) | ||
324 | seq_printf(m,"cpu family\t: M32104\n" | ||
325 | "cache size\t: I-8KB/D-8KB\n"); | ||
323 | #else | 326 | #else |
324 | seq_printf(m, "cpu family\t: Unknown\n"); | 327 | seq_printf(m, "cpu family\t: Unknown\n"); |
325 | #endif | 328 | #endif |
@@ -340,6 +343,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
340 | seq_printf(m, "Machine\t\t: uServer\n"); | 343 | seq_printf(m, "Machine\t\t: uServer\n"); |
341 | #elif defined(CONFIG_PLAT_OAKS32R) | 344 | #elif defined(CONFIG_PLAT_OAKS32R) |
342 | seq_printf(m, "Machine\t\t: OAKS32R\n"); | 345 | seq_printf(m, "Machine\t\t: OAKS32R\n"); |
346 | #elif defined(CONFIG_PLAT_M32104UT) | ||
347 | seq_printf(m, "Machine\t\t: M3T-M32104UT uT Engine board\n"); | ||
343 | #else | 348 | #else |
344 | seq_printf(m, "Machine\t\t: Unknown\n"); | 349 | seq_printf(m, "Machine\t\t: Unknown\n"); |
345 | #endif | 350 | #endif |
@@ -389,7 +394,7 @@ unsigned long cpu_initialized __initdata = 0; | |||
389 | */ | 394 | */ |
390 | #if defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ | 395 | #if defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ |
391 | || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \ | 396 | || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \ |
392 | || defined(CONFIG_CHIP_OPSP) | 397 | || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104) |
393 | void __init cpu_init (void) | 398 | void __init cpu_init (void) |
394 | { | 399 | { |
395 | int cpu_id = smp_processor_id(); | 400 | int cpu_id = smp_processor_id(); |