Blackfin arch: use "char bfin_board_name[]" rather than "char *bfin_board_name" per discussion on lkml as the former uses less storage
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
parent
c1e7399da7
commit
066954a389
16 changed files with 25 additions and 25 deletions
|
@ -498,7 +498,7 @@ EXPORT_SYMBOL(get_sclk);
|
||||||
*/
|
*/
|
||||||
static int show_cpuinfo(struct seq_file *m, void *v)
|
static int show_cpuinfo(struct seq_file *m, void *v)
|
||||||
{
|
{
|
||||||
char *cpu, *mmu, *fpu, *name, vendor[20], cache[30];
|
char *cpu, *mmu, *fpu, *vendor, *cache;
|
||||||
uint32_t revid;
|
uint32_t revid;
|
||||||
|
|
||||||
u_long cclk = 0, sclk = 0;
|
u_long cclk = 0, sclk = 0;
|
||||||
|
@ -508,17 +508,17 @@ static int show_cpuinfo(struct seq_file *m, void *v)
|
||||||
mmu = "none";
|
mmu = "none";
|
||||||
fpu = "none";
|
fpu = "none";
|
||||||
revid = bfin_revid();
|
revid = bfin_revid();
|
||||||
name = bfin_board_name;
|
|
||||||
|
|
||||||
cclk = get_cclk();
|
cclk = get_cclk();
|
||||||
sclk = get_sclk();
|
sclk = get_sclk();
|
||||||
|
|
||||||
switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) {
|
switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) {
|
||||||
case(0xca):
|
case 0xca:
|
||||||
strcpy(vendor, "AnalogDevices");
|
vendor = "Analog Devices";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
strcpy(vendor, "unknown");
|
vendor = "unknown";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
seq_printf(m, "processor\t: %d\n"
|
seq_printf(m, "processor\t: %d\n"
|
||||||
|
@ -544,22 +544,22 @@ static int show_cpuinfo(struct seq_file *m, void *v)
|
||||||
/* Check Cache configutation */
|
/* Check Cache configutation */
|
||||||
switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
|
switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {
|
||||||
case ACACHE_BSRAM:
|
case ACACHE_BSRAM:
|
||||||
strcpy(cache, "dbank-A/B\t: cache/sram");
|
cache = "dbank-A/B\t: cache/sram";
|
||||||
dcache_size = 16;
|
dcache_size = 16;
|
||||||
dsup_banks = 1;
|
dsup_banks = 1;
|
||||||
break;
|
break;
|
||||||
case ACACHE_BCACHE:
|
case ACACHE_BCACHE:
|
||||||
strcpy(cache, "dbank-A/B\t: cache/cache");
|
cache = "dbank-A/B\t: cache/cache";
|
||||||
dcache_size = 32;
|
dcache_size = 32;
|
||||||
dsup_banks = 2;
|
dsup_banks = 2;
|
||||||
break;
|
break;
|
||||||
case ASRAM_BSRAM:
|
case ASRAM_BSRAM:
|
||||||
strcpy(cache, "dbank-A/B\t: sram/sram");
|
cache = "dbank-A/B\t: sram/sram";
|
||||||
dcache_size = 0;
|
dcache_size = 0;
|
||||||
dsup_banks = 0;
|
dsup_banks = 0;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
strcpy(cache, "unknown");
|
cache = "unknown";
|
||||||
dcache_size = 0;
|
dcache_size = 0;
|
||||||
dsup_banks = 0;
|
dsup_banks = 0;
|
||||||
break;
|
break;
|
||||||
|
@ -639,7 +639,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
seq_printf(m, "board name\t: %s\n", name);
|
seq_printf(m, "board name\t: %s\n", bfin_board_name);
|
||||||
seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n",
|
seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n",
|
||||||
physical_mem_end >> 10, (void *)0, (void *)physical_mem_end);
|
physical_mem_end >> 10, (void *)0, (void *)physical_mem_end);
|
||||||
seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n",
|
seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n",
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "ADDS-BF527-EZKIT";
|
const char bfin_board_name[] = "ADDS-BF527-EZKIT";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "Bluetechnix CM BF533";
|
const char bfin_board_name[] = "Bluetechnix CM BF533";
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
|
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
|
||||||
/* all SPI peripherals info goes here */
|
/* all SPI peripherals info goes here */
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "ADDS-BF533-EZKIT";
|
const char bfin_board_name[] = "ADDS-BF533-EZKIT";
|
||||||
|
|
||||||
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
|
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
|
||||||
static struct platform_device rtc_device = {
|
static struct platform_device rtc_device = {
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "UNKNOWN BOARD";
|
const char bfin_board_name[] = "UNKNOWN BOARD";
|
||||||
|
|
||||||
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
|
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
|
||||||
static struct platform_device rtc_device = {
|
static struct platform_device rtc_device = {
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "ADDS-BF533-STAMP";
|
const char bfin_board_name[] = "ADDS-BF533-STAMP";
|
||||||
|
|
||||||
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
|
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
|
||||||
static struct platform_device rtc_device = {
|
static struct platform_device rtc_device = {
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "Bluetechnix CM BF537";
|
const char bfin_board_name[] = "Bluetechnix CM BF537";
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
|
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
|
||||||
/* all SPI peripherals info goes here */
|
/* all SPI peripherals info goes here */
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "GENERIC Board";
|
const char bfin_board_name[] = "GENERIC Board";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "PNAV-1.0";
|
const char bfin_board_name[] = "PNAV-1.0";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "ADDS-BF537-STAMP";
|
const char bfin_board_name[] = "ADDS-BF537-STAMP";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "ADSP-BF548-EZKIT";
|
const char bfin_board_name[] = "ADSP-BF548-EZKIT";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "Bluetechnix CM BF561";
|
const char bfin_board_name[] = "Bluetechnix CM BF561";
|
||||||
|
|
||||||
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
|
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
|
||||||
/* all SPI peripherals info goes here */
|
/* all SPI peripherals info goes here */
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
/*
|
/*
|
||||||
* Name the Board for the /proc/cpuinfo
|
* Name the Board for the /proc/cpuinfo
|
||||||
*/
|
*/
|
||||||
char *bfin_board_name = "ADDS-BF561-EZKIT";
|
const char bfin_board_name[] = "ADDS-BF561-EZKIT";
|
||||||
|
|
||||||
#define ISP1761_BASE 0x2C0F0000
|
#define ISP1761_BASE 0x2C0F0000
|
||||||
#define ISP1761_IRQ IRQ_PF10
|
#define ISP1761_IRQ IRQ_PF10
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
|
|
||||||
char *bfin_board_name = "UNKNOWN BOARD";
|
const char bfin_board_name[] = "UNKNOWN BOARD";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
|
|
||||||
char *bfin_board_name = "Tepla-BF561";
|
const char bfin_board_name[] = "Tepla-BF561";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Driver needs to know address, irq and flag pin.
|
* Driver needs to know address, irq and flag pin.
|
||||||
|
|
|
@ -105,7 +105,7 @@ extern void led_disp_num(int);
|
||||||
extern void led_toggle_num(int);
|
extern void led_toggle_num(int);
|
||||||
extern void init_leds(void);
|
extern void init_leds(void);
|
||||||
|
|
||||||
extern char *bfin_board_name __attribute__ ((weak));
|
extern const char bfin_board_name[];
|
||||||
extern unsigned long wall_jiffies;
|
extern unsigned long wall_jiffies;
|
||||||
extern unsigned long ipdt_table[];
|
extern unsigned long ipdt_table[];
|
||||||
extern unsigned long dpdt_table[];
|
extern unsigned long dpdt_table[];
|
||||||
|
|
Loading…
Reference in a new issue