Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 066954a3 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: use "char bfin_board_name[]" rather than "char... 


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: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent c1e7399d

arch/blackfin/kernel/setup.c

+10 −10
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ EXPORT_SYMBOL(get_sclk); 
 */

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;



	u_long cclk = 0, sclk = 0;
@@ -508,17 +508,17 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	mmu = "none";

	fpu = "none";

	revid = bfin_revid();

	name = bfin_board_name;



	cclk = get_cclk();

	sclk = get_sclk();



	switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) {

	case(0xca):

		strcpy(vendor, "AnalogDevices");

	case 0xca:

		vendor = "Analog Devices";

		break;

	default:

		strcpy(vendor, "unknown");

		vendor = "unknown";

		break;

	}



	seq_printf(m, "processor\t: %d\n"
@@ -544,22 +544,22 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	/* Check Cache configutation */

	switch (bfin_read_DMEM_CONTROL() & (1 << DMC0_P | 1 << DMC1_P)) {

	case ACACHE_BSRAM:

		strcpy(cache, "dbank-A/B\t: cache/sram");

		cache = "dbank-A/B\t: cache/sram";

		dcache_size = 16;

		dsup_banks = 1;

		break;

	case ACACHE_BCACHE:

		strcpy(cache, "dbank-A/B\t: cache/cache");

		cache = "dbank-A/B\t: cache/cache";

		dcache_size = 32;

		dsup_banks = 2;

		break;

	case ASRAM_BSRAM:

		strcpy(cache, "dbank-A/B\t: sram/sram");

		cache = "dbank-A/B\t: sram/sram";

		dcache_size = 0;

		dsup_banks = 0;

		break;

	default:

		strcpy(cache, "unknown");

		cache = "unknown";

		dcache_size = 0;

		dsup_banks = 0;

		break;
@@ -639,7 +639,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	}

#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",

		 physical_mem_end >> 10, (void *)0, (void *)physical_mem_end);

	seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n",

arch/blackfin/mach-bf527/boards/ezkit.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
/*

 * 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.

arch/blackfin/mach-bf533/boards/cm_bf533.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
/*

 * 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)

/* all SPI peripherals info goes here */

arch/blackfin/mach-bf533/boards/ezkit.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
/*

 * 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)

static struct platform_device rtc_device = {

arch/blackfin/mach-bf533/boards/generic_board.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
/*

 * 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)

static struct platform_device rtc_device = {