leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AP1000: Inline local 'get_device'

Browse Source 
The AP1000 defines a 'get_device' function to determine what board
revision we are on.  Inline that checking as it conflicts with the
get_device() in <part.h> and is only used once.

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini 2012-10-01 08:21:35 -07:00
parent 4668a086bb
commit e1f92e819d
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
board/amirix/ap1000/ap1000.c
View File

@ -43,11 +43,13 @@ int checkboard (void)
/* After a loadace command, the SystemAce control register is left in a wonky state. */ /* After a loadace command, the SystemAce control register is left in a wonky state. */
/* this code did not work in board_pre_init */ /* this code did not work in board_pre_init */
unsigned char *p = (unsigned char *) AP1000_SYSACE_REGBASE; unsigned char *p = (unsigned char *) AP1000_SYSACE_REGBASE;
unsigned int *revision_reg_ptr = (unsigned int *) AP1xx_FPGA_REV_ADDR;
unsigned int device = (*revision_reg_ptr & AP1xx_TARGET_MASK);
p[SYSACE_CTRLREG0] = 0x0; p[SYSACE_CTRLREG0] = 0x0;
/* add platform and device to banner */ /* add platform and device to banner */
switch (get_device ()) { switch (device) {
case AP1xx_AP107_TARGET: case AP1xx_AP107_TARGET:
puts (AP1xx_AP107_TARGET_STR); puts (AP1xx_AP107_TARGET_STR);
break; break;
@ -160,13 +162,6 @@ unsigned int get_platform (void)
return (*revision_reg_ptr & AP1xx_PLATFORM_MASK); return (*revision_reg_ptr & AP1xx_PLATFORM_MASK);
} }
unsigned int get_device (void)
{
unsigned int *revision_reg_ptr = (unsigned int *) AP1xx_FPGA_REV_ADDR;
return (*revision_reg_ptr & AP1xx_TARGET_MASK);
}
#if 0 /* loadace is not working; it appears to be a hardware issue with the system ace. */ #if 0 /* loadace is not working; it appears to be a hardware issue with the system ace. */
/* /*
This function loads FPGA configurations from the SystemACE CompactFlash This function loads FPGA configurations from the SystemACE CompactFlash

1
board/amirix/ap1000/ap1000.h
View File

@ -164,7 +164,6 @@
void set_eat_machine_checks(int a_flag); void set_eat_machine_checks(int a_flag);
int get_eat_machine_checks(void); int get_eat_machine_checks(void);
unsigned int get_platform(void); unsigned int get_platform(void);
unsigned int get_device(void);
void* memcpyb(void * dest,const void *src,size_t count); void* memcpyb(void * dest,const void *src,size_t count);
int process_bootflag(ulong bootflag); int process_bootflag(ulong bootflag);
void user_led_on(void); void user_led_on(void);