dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

m68knommu: move ColdFire CPU names into their headers 

Move the ColdFire CPU names out of setup.c and into their repsective
headers. That way when we add new ones we won't need to modify
setup.c any more.

Add the missing 548x CPU name.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
Greg Ungerer 2010-11-02 17:13:27 +10:00
parent 9e29949cfc
commit 7fc82b655a
12 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/m68k/include/asm/m5206sim.h
View File

@ -12,6 +12,7 @@
#define m5206sim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m5206)"
/*
* Define the 5206 SIM register set addresses.

2
arch/m68k/include/asm/m520xsim.h
View File

@ -11,6 +11,8 @@
#define m520xsim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m520x)"
/*
* Define the 520x SIM register set addresses.
*/

1
arch/m68k/include/asm/m523xsim.h
View File

@ -11,6 +11,7 @@
#define m523xsim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m523x)"
/*
* Define the 523x SIM register set addresses.

2
arch/m68k/include/asm/m5249sim.h
View File

@ -11,6 +11,8 @@
#define m5249sim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m5249)"
/*
* Define the 5249 SIM register set addresses.
*/

2
arch/m68k/include/asm/m5272sim.h
View File

@ -12,6 +12,8 @@
#define m5272sim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m5272)"
/*
* Define the 5272 SIM register set addresses.
*/

2
arch/m68k/include/asm/m527xsim.h
View File

@ -11,6 +11,8 @@
#define m527xsim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m527x)"
/*
* Define the 5270/5271 SIM register set addresses.

1
arch/m68k/include/asm/m528xsim.h
View File

@ -11,6 +11,7 @@
#define m528xsim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m528x)"
/*
* Define the 5280/5282 SIM register set addresses.

2
arch/m68k/include/asm/m5307sim.h
View File

@ -14,6 +14,8 @@
#define m5307sim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m5307)"
/*
* Define the 5307 SIM register set addresses.
*/

2
arch/m68k/include/asm/m532xsim.h
View File

@ -9,6 +9,8 @@
#define m532xsim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m532x)"
#define MCF_REG32(x) (*(volatile unsigned long *)(x))
#define MCF_REG16(x) (*(volatile unsigned short *)(x))
#define MCF_REG08(x) (*(volatile unsigned char *)(x))

2
arch/m68k/include/asm/m5407sim.h
View File

@ -14,6 +14,8 @@
#define m5407sim_h
/****************************************************************************/
#define CPU_NAME "COLDFIRE(m5407)"
/*
* Define the 5407 SIM register set addresses.
*/

2
arch/m68k/include/asm/m54xxsim.h
View File

@ -5,6 +5,8 @@
#ifndef m54xxsim_h
#define m54xxsim_h
#define CPU_NAME "COLDFIRE(m54xx)"
#define MCFINT_VECBASE 64
/*

55
arch/m68knommu/kernel/setup.c
View File

@ -55,55 +55,22 @@ void (*mach_halt)(void);
void (*mach_power_off)(void);
#ifdef CONFIG_M68328
#define CPU "MC68328"
#define CPU_NAME "MC68328"
#endif
#ifdef CONFIG_M68EZ328
#define CPU "MC68EZ328"
#define CPU_NAME "MC68EZ328"
#endif
#ifdef CONFIG_M68VZ328
#define CPU "MC68VZ328"
#define CPU_NAME "MC68VZ328"
#endif
#ifdef CONFIG_M68360
#define CPU "MC68360"
#define CPU_NAME "MC68360"
#endif
#if defined(CONFIG_M5206)
#define CPU "COLDFIRE(m5206)"
#endif
#if defined(CONFIG_M5206e)
#define CPU "COLDFIRE(m5206e)"
#endif
#if defined(CONFIG_M520x)
#define CPU "COLDFIRE(m520x)"
#endif
#if defined(CONFIG_M523x)
#define CPU "COLDFIRE(m523x)"
#endif
#if defined(CONFIG_M5249)
#define CPU "COLDFIRE(m5249)"
#endif
#if defined(CONFIG_M5271)
#define CPU "COLDFIRE(m5270/5271)"
#endif
#if defined(CONFIG_M5272)
#define CPU "COLDFIRE(m5272)"
#endif
#if defined(CONFIG_M5275)
#define CPU "COLDFIRE(m5274/5275)"
#endif
#if defined(CONFIG_M528x)
#define CPU "COLDFIRE(m5280/5282)"
#endif
#if defined(CONFIG_M5307)
#define CPU "COLDFIRE(m5307)"
#endif
#if defined(CONFIG_M532x)
#define CPU "COLDFIRE(m532x)"
#endif
#if defined(CONFIG_M5407)
#define CPU "COLDFIRE(m5407)"
#endif
#ifndef CPU
#define CPU "UNKNOWN"
/*
* The ColdFire CPU names are defined in their headers.
*/
#ifndef CPU_NAME
#define CPU_NAME "UNKNOWN"
#endif
extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
@ -208,7 +175,7 @@ void __init setup_arch(char **cmdline_p)
command_line[sizeof(command_line) - 1] = 0;
#endif /* CONFIG_UBOOT */
printk(KERN_INFO "\x0F\r\n\nuClinux/" CPU "\n");
printk(KERN_INFO "\x0F\r\n\nuClinux/" CPU_NAME "\n");
#ifdef CONFIG_UCDIMM
printk(KERN_INFO "uCdimm by Lineo, Inc. <www.lineo.com>\n");
@ -303,7 +270,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
char *cpu, *mmu, *fpu;
u_long clockfreq;
cpu = CPU;
cpu = CPU_NAME;
mmu = "none";
fpu = "none";