Skip to contentSkip to conversation

Compilation warning: "MSR_RI" redefined

U-Boot Applied Stefan Roese 4 participants 6 messages Apr 2, 2009 – Apr 3, 2009

lore
Share & tools
lore
#0 lore raw

Hi Detlev,

your patch 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware diagnosis functions for inka4x0] introduced all kind of new defines in the ns16550.h header resulting in a warning on some 4xx platforms:

[stefan at kubuntu u-boot (master)]$ ./MAKEALL ml300
Configuring for ml300 board...
In file included from serial.c:53:
/home/stefan/git/u-boot/u-boot/include/ns16550.h:151:1: warning: "MSR_RI" redefined
In file included from serial.c:41:
/home/stefan/git/u-boot/u-boot/include/asm/processor.h:48:1: warning: this is the location of the previous definition

I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

#1 lore raw

Hi Stefan,

Quoted 13 lines

your patch 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware diagnosis functions for inka4x0] introduced all kind of new defines in the ns16550.h header resulting in a warning on some 4xx platforms:

[stefan at kubuntu u-boot (master)]$ ./MAKEALL ml300
Configuring for ml300 board...
In file included from serial.c:53:
/home/stefan/git/u-boot/u-boot/include/ns16550.h:151:1: warning: "MSR_RI" redefined
In file included from serial.c:41:
/home/stefan/git/u-boot/u-boot/include/asm/processor.h:48:1: warning: this is the location of the previous definition

Quoted 2 lines

I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it.

Ok, so much for the plan to add the defines not bit by bit as needed, but register-wise, while we're there.

I actually would prefer to use UART_MSR_RI, as this is a UART thingy rather than to remove the define as we surely use the register, so I feel it worthwhile to have the whole definition on board.

Let me cook up a rename for the UART stuff..

Cheers
Detlev

Signature · 8 lines
We have a live-manual.  It's called emacs-devel at gnu.org.
You can stick to just reading it, but you can skip to a specific chapter
by simply sending an email asking for it ;-)
                                    -- Stefan Monnier
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
#2 lore raw
Quoted 9 lines · Detlev Zundel
Quoted 2 lines

I suggest to either remove this MSI_RI from the header again (it doesn't seem to be used here) or rename it.

Ok, so much for the plan to add the defines not bit by bit as needed, but register-wise, while we're there.

I actually would prefer to use UART_MSR_RI, as this is a UART thingy rather than to remove the define as we surely use the register, so I feel it worthwhile to have the whole definition on board.

That's my preference as well.

Quoted 1 line

Let me cook up a rename for the UART stuff..

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

#3 lore raw
Quoted 5 lines · Stefan Roese
Quoted 4 lines · Detlev Zundel
Quoted 3 lines

I suggest to either remove this MSI_RI from the header again (it doesn't
seem to be used here) or rename it.

Quoted 8 lines
Quoted 6 lines

Ok, so much for the plan to add the defines not bit by bit as needed, but register-wise, while we're there.

I actually would prefer to use UART_MSR_RI, as this is a UART thingy rather than to remove the define as we surely use the register, so I feel it worthwhile to have the whole definition on board.

That's my preference as well.

Agreed, when I saw MSR_RI I wasn't thinking UART at all.

- k

#5 lore raw

Dear Detlev,

Quoted 3 lines · In message <[email protected]> you wrote:

Attached is a patch which fixes this fallout and starts a round of cleanups.

Please submit patches inline, not as attachments!

Quoted 11 lines

Subject: [PATCH] Rename common ns16550 constants with UART_ prefix to prevent conflicts

Fix problems introduced in commit 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware diagnosis functions for inka4x0] which redefined MSR_RI which is already used on PowerPC systems.

Also eliminate redundant definitions in ps2mult.h. More cleanup will be needed for other redundant occurrences though.

Quoted 8 lines
---
 board/inka4x0/inkadiag.c |   20 ++++----
 board/linkstation/avr.c  |    6 +-
 drivers/input/ps2ser.c   |   22 ++++----
 drivers/serial/ns16550.c |   39 +++++++------
 include/ns16550.h        |  135 +++++++++++++++++++++++++++++++--------------
 include/ps2mult.h        |   99 ---------------------------------
 6 files changed, 139 insertions(+), 182 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
[Doctors and Bartenders], We both get the same two kinds of customers
-- the living and the dying.
	-- Dr. Boyce, "The Menagerie" ("The Cage"), stardate unknown