AP1000: Inline local 'get_device'

PATCH New Tom Rini 3 participants 4 messages Oct 1, 2012 – Oct 3, 2012

Share & tools

Tom Rini

author

2012-10-01 15:41 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 board/amirix/ap1000/ap1000.c |   11 +++--------
 board/amirix/ap1000/ap1000.h |    1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

board/amirix/ap1000/ap1000.c +3 -8

index 64de04c..dbcb34b 100644
@@ -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

board/amirix/ap1000/ap1000.h +0 -1

index 118c4d1..d294816 100644
@@ -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);

Signature · 1 line

1.7.9.5

Stefan Roese

2012-10-02 13:14 UTC #1 lore raw

PATCH 1/1 AP1000: Inline local 'get_device'

Hi Tom,

Quoted 3 lines · Tom Rini

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

author

2012-10-02 16:26 UTC #2 lore raw

PATCH 1/1 AP1000: Inline local 'get_device'

Quoted 10 lines · Stefan Roese

Hi Tom,
Quoted 3 lines · Tom Rini
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.

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20121002/d5889a25/attachment.pgp>

Marek Vasut

2012-10-03 00:13 UTC #3 lore raw

PATCH 1/1 AP1000: Inline local 'get_device'

Dear Tom Rini,

Quoted 8 lines · Stefan Roese

Quoted 7 lines
Hi Tom,
Quoted 3 lines · Tom Rini
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.

Quoted 5 lines

Quoted 3 lines
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