GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-03 04:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mpc83xx: move CPU_TYPE_ENTRY over to processor.h

Browse source 
to avoid this:

cpu.c:47:1: warning: "CPU_TYPE_ENTRY" redefined
In file included from cpu.c:33:
/home/kim/git/u-boot/include/asm/processor.h:982:1: warning: this is the location of the previous definition

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
Kim Phillips 2008-06-17 17:45:27 -05:00
parent 914f58c576
commit 4890246a2c
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpu/mpc83xx/cpu.c
View file

@ -44,7 +44,6 @@ int checkcpu(void)
char buf[32]; char buf[32];
int i; int i;
#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
const struct cpu_type { const struct cpu_type {
char name[15]; char name[15];
u32 partid; u32 partid;

7
include/asm-ppc/processor.h
View file

@ -970,8 +970,15 @@ struct cpu_type {
struct cpu_type *identify_cpu(u32 ver); struct cpu_type *identify_cpu(u32 ver);
#if defined(CONFIG_MPC85xx)
#define CPU_TYPE_ENTRY(n, v) \ #define CPU_TYPE_ENTRY(n, v) \
{ .name = #n, .soc_ver = SVR_##v, } { .name = #n, .soc_ver = SVR_##v, }
#else
#if defined(CONFIG_MPC83XX)
#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
#endif
#endif
#ifndef CONFIG_MACH_SPECIFIC #ifndef CONFIG_MACH_SPECIFIC
extern int _machine; extern int _machine;