AP1000: Inline local 'get_device'

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>

diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index 64de04ca29dfc212a52c6fd07a3815efc252dc67..dbcb34b8f013f90e4b9b43e306f2e0f4b3935c7a 100644 (file)
--- a/board/amirix/ap1000/ap1000.c
+++ b/board/amirix/ap1000/ap1000.c
@@ -43,11 +43,13 @@ int checkboard (void)
        /* After a loadace command, the SystemAce control register is left in a wonky state. */
        /* this code did not work in board_pre_init */
        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;
 
        /* add platform and device to banner */
-       switch (get_device ()) {
+       switch (device) {
        case AP1xx_AP107_TARGET:
                puts (AP1xx_AP107_TARGET_STR);
                break;
@@ -160,13 +162,6 @@ unsigned int get_platform (void)
        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. */
 /*
    This function loads FPGA configurations from the SystemACE CompactFlash

diff --git a/board/amirix/ap1000/ap1000.h b/board/amirix/ap1000/ap1000.h
index 118c4d1b9a692893c40e97c8dea0e23b7aaa2c7e..d294816d26c98b3528e8040d089b0b1c35af7019 100644 (file)
--- a/board/amirix/ap1000/ap1000.h
+++ b/board/amirix/ap1000/ap1000.h
@@ -164,7 +164,6 @@
 void set_eat_machine_checks(int a_flag);
 int get_eat_machine_checks(void);
 unsigned int get_platform(void);
-unsigned int get_device(void);
 void* memcpyb(void * dest,const void *src,size_t count);
 int process_bootflag(ulong bootflag);
 void user_led_on(void);