Patchwork [U-Boot] AP1000: Inline local 'get_device'

login
register
mail settings
Submitter Tom Rini
Date Oct. 1, 2012, 3:41 p.m.
Message ID <1349106096-31498-1-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/188319/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - Oct. 1, 2012, 3:41 p.m.
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>
---
 board/amirix/ap1000/ap1000.c |   11 +++--------
 board/amirix/ap1000/ap1000.h |    1 -
 2 files changed, 3 insertions(+), 9 deletions(-)
Stefan Roese - Oct. 2, 2012, 1:14 p.m.
Hi Tom,

On 10/01/2012 05:41 PM, Tom Rini wrote:
> 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.

I plan to remove AP1000 board support completely. Board seems to be
unmaintained. I'll push the patch (and others) to "next" today and send
a pull request.

Thanks,
Stefan
Tom Rini - Oct. 2, 2012, 4:26 p.m.
On Tue, Oct 02, 2012 at 03:14:30PM +0200, Stefan Roese wrote:
> Hi Tom,
> 
> On 10/01/2012 05:41 PM, Tom Rini wrote:
> > 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.
> 
> I plan to remove AP1000 board support completely. Board seems to be
> unmaintained. I'll push the patch (and others) to "next" today and send
> a pull request.

Works for me, thanks.
Marek Vasut - Oct. 3, 2012, 12:13 a.m.
Dear Tom Rini,

> On Tue, Oct 02, 2012 at 03:14:30PM +0200, Stefan Roese wrote:
> > Hi Tom,
> > 
> > On 10/01/2012 05:41 PM, Tom Rini wrote:
> > > 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.
> > 
> > I plan to remove AP1000 board support completely. Board seems to be
> > unmaintained. I'll push the patch (and others) to "next" today and send
> > a pull request.
> 
> Works for me, thanks.

CC me on that pull RQ please so I know which bloody zombies get stopped :)

Best regards,
Marek Vasut

Patch

diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index 64de04c..dbcb34b 100644
--- 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 118c4d1..d294816 100644
--- 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);