diff options
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
-rw-r--r-- | arch/blackfin/kernel/setup.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 34fbf93cc118..6b85145f8488 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -498,7 +498,7 @@ EXPORT_SYMBOL(get_sclk); | |||
498 | */ | 498 | */ |
499 | static int show_cpuinfo(struct seq_file *m, void *v) | 499 | static int show_cpuinfo(struct seq_file *m, void *v) |
500 | { | 500 | { |
501 | char *cpu, *mmu, *fpu, *name, vendor[20], cache[30]; | 501 | char *cpu, *mmu, *fpu, *vendor, *cache; |
502 | uint32_t revid; | 502 | uint32_t revid; |
503 | 503 | ||
504 | u_long cclk = 0, sclk = 0; | 504 | u_long cclk = 0, sclk = 0; |
@@ -508,17 +508,17 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
508 | mmu = "none"; | 508 | mmu = "none"; |
509 | fpu = "none"; | 509 | fpu = "none"; |
510 | revid = bfin_revid(); | 510 | revid = bfin_revid(); |
511 | name = bfin_board_name; | ||
512 | 511 | ||
513 | cclk = get_cclk(); | 512 | cclk = get_cclk(); |
514 | sclk = get_sclk(); | 513 | sclk = get_sclk(); |
515 | 514 | ||
516 | switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) { | 515 | switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) { |
517 | case(0xca): | 516 | case 0xca: |
518 | strcpy(vendor, "AnalogDevices"); | 517 | vendor = "Analog Devices"; |
519 | break; | 518 | break; |
520 | default: | 519 | default: |
521 | strcpy(vendor, "unknown"); | 520 | vendor = "unknown"; |
521 | break; | ||
522 | } | 522 | } |
523 | 523 | ||
524 | seq_printf(m, "processor\t: %d\n" | 524 | seq_printf(m, "processor\t: %d\n" |
@@ -544,22 +544,22 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
544 | /* Check Cache configutation */ | 544 | /* Check Cache configutation */ |
545 | switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) { | 545 | switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) { |
546 | case ACACHE_BSRAM: | 546 | case ACACHE_BSRAM: |
547 | strcpy(cache, "dbank-A/B\t: cache/sram"); | 547 | cache = "dbank-A/B\t: cache/sram"; |
548 | dcache_size = 16; | 548 | dcache_size = 16; |
549 | dsup_banks = 1; | 549 | dsup_banks = 1; |
550 | break; | 550 | break; |
551 | case ACACHE_BCACHE: | 551 | case ACACHE_BCACHE: |
552 | strcpy(cache, "dbank-A/B\t: cache/cache"); | 552 | cache = "dbank-A/B\t: cache/cache"; |
553 | dcache_size = 32; | 553 | dcache_size = 32; |
554 | dsup_banks = 2; | 554 | dsup_banks = 2; |
555 | break; | 555 | break; |
556 | case ASRAM_BSRAM: | 556 | case ASRAM_BSRAM: |
557 | strcpy(cache, "dbank-A/B\t: sram/sram"); | 557 | cache = "dbank-A/B\t: sram/sram"; |
558 | dcache_size = 0; | 558 | dcache_size = 0; |
559 | dsup_banks = 0; | 559 | dsup_banks = 0; |
560 | break; | 560 | break; |
561 | default: | 561 | default: |
562 | strcpy(cache, "unknown"); | 562 | cache = "unknown"; |
563 | dcache_size = 0; | 563 | dcache_size = 0; |
564 | dsup_banks = 0; | 564 | dsup_banks = 0; |
565 | break; | 565 | break; |
@@ -639,7 +639,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
639 | } | 639 | } |
640 | #endif | 640 | #endif |
641 | 641 | ||
642 | seq_printf(m, "board name\t: %s\n", name); | 642 | seq_printf(m, "board name\t: %s\n", bfin_board_name); |
643 | seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n", | 643 | seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n", |
644 | physical_mem_end >> 10, (void *)0, (void *)physical_mem_end); | 644 | physical_mem_end >> 10, (void *)0, (void *)physical_mem_end); |
645 | seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n", | 645 | seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n", |