* [U-Boot] [PATCH] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition
@ 2014-03-13 10:48 Masahiro Yamada
2014-03-27 17:00 ` [U-Boot] " Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2014-03-13 10:48 UTC (permalink / raw)
To: u-boot
CONFIG_LEON is already defined in
arch/sparc/cpu/{leon2,leon3}/config.mk.
Remove the redundant definition in board header files.
All leon3 boards define CONFIG_LEON3 in board header files.
Move the definition to arch/sparc/cpu/leon3/config.mk.
CONFIG_LEON2 can be move to arch/sparc/cpu/leon2/config.mk
as well.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
---
arch/sparc/cpu/leon2/config.mk | 2 +-
arch/sparc/cpu/leon3/config.mk | 2 +-
include/configs/gr_cpci_ax2000.h | 2 --
include/configs/gr_ep2s60.h | 2 --
include/configs/gr_xc3s_1500.h | 2 --
include/configs/grsim.h | 2 --
include/configs/grsim_leon2.h | 2 --
7 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/arch/sparc/cpu/leon2/config.mk b/arch/sparc/cpu/leon2/config.mk
index f9b0d34..c44b093 100644
--- a/arch/sparc/cpu/leon2/config.mk
+++ b/arch/sparc/cpu/leon2/config.mk
@@ -7,4 +7,4 @@
PLATFORM_RELFLAGS += -fPIC
-PLATFORM_CPPFLAGS += -DCONFIG_LEON
+PLATFORM_CPPFLAGS += -DCONFIG_LEON -DCONFIG_LEON2
diff --git a/arch/sparc/cpu/leon3/config.mk b/arch/sparc/cpu/leon3/config.mk
index f9b0d34..ca6c9b1 100644
--- a/arch/sparc/cpu/leon3/config.mk
+++ b/arch/sparc/cpu/leon3/config.mk
@@ -7,4 +7,4 @@
PLATFORM_RELFLAGS += -fPIC
-PLATFORM_CPPFLAGS += -DCONFIG_LEON
+PLATFORM_CPPFLAGS += -DCONFIG_LEON -DCONFIG_LEON3
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 8f4b85b..a4b5eb3 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -22,8 +22,6 @@
* (easy to change)
*/
-#define CONFIG_LEON3 /* This is an LEON3 CPU */
-#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_CPCI_AX2000 1 /* ... on GR-CPCI-AX2000 board */
#define CONFIG_LEON_RAM_SRAM 1
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 1e829aa..b7f094f 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -23,8 +23,6 @@
* (easy to change)
*/
-#define CONFIG_LEON3 /* This is an LEON3 CPU */
-#define CONFIG_LEON 1 /* This is an LEON CPU */
/* Altera NIOS Development board, Stratix II board */
#define CONFIG_GR_EP2S60 1
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index e9e64f1..789b3ed 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -21,8 +21,6 @@
* (easy to change)
*/
-#define CONFIG_LEON3 /* This is an LEON3 CPU */
-#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_GRXC3S1500 1 /* ... on GR-XC3S-1500 board */
/* CPU / AMBA BUS configuration */
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index f50dd54..82b7a4e 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -27,8 +27,6 @@
*
*/
-#define CONFIG_LEON3 /* This is an LEON3 CPU */
-#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_GRSIM 0 /* ... not running on GRSIM */
#define CONFIG_TSIM 1 /* ... running on TSIM */
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 9ea6d9b..8cb077c 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -26,8 +26,6 @@
*
*/
-#define CONFIG_LEON2 /* This is an LEON2 CPU */
-#define CONFIG_LEON 1 /* This is an LEON CPU */
#define CONFIG_GRSIM 0 /* ... not running on GRSIM */
#define CONFIG_TSIM 1 /* ... running on TSIM */
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition
2014-03-13 10:48 [U-Boot] [PATCH] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition Masahiro Yamada
@ 2014-03-27 17:00 ` Tom Rini
2014-03-28 2:34 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2014-03-27 17:00 UTC (permalink / raw)
To: u-boot
On Thu, Mar 13, 2014 at 07:48:57PM +0900, Masahiro Yamada wrote:
> CONFIG_LEON is already defined in
> arch/sparc/cpu/{leon2,leon3}/config.mk.
> Remove the redundant definition in board header files.
>
> All leon3 boards define CONFIG_LEON3 in board header files.
> Move the definition to arch/sparc/cpu/leon3/config.mk.
>
> CONFIG_LEON2 can be move to arch/sparc/cpu/leon2/config.mk
> as well.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Daniel Hellstrom <daniel@gaisler.com>
Applied to u-boot/next, thanks!
--
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/20140327/e4eaf348/attachment.pgp>
^ permalink raw reply [flat|nested] 5+ messages in thread* [U-Boot] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition
2014-03-27 17:00 ` [U-Boot] " Tom Rini
@ 2014-03-28 2:34 ` Masahiro Yamada
2014-03-28 15:42 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2014-03-28 2:34 UTC (permalink / raw)
To: u-boot
Hi Tom,
On Thu, 27 Mar 2014 13:00:19 -0400
Tom Rini <trini@ti.com> wrote:
> On Thu, Mar 13, 2014 at 07:48:57PM +0900, Masahiro Yamada wrote:
>
> > CONFIG_LEON is already defined in
> > arch/sparc/cpu/{leon2,leon3}/config.mk.
> > Remove the redundant definition in board header files.
> >
> > All leon3 boards define CONFIG_LEON3 in board header files.
> > Move the definition to arch/sparc/cpu/leon3/config.mk.
> >
> > CONFIG_LEON2 can be move to arch/sparc/cpu/leon2/config.mk
> > as well.
> >
> > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > Cc: Daniel Hellstrom <daniel@gaisler.com>
>
> Applied to u-boot/next, thanks!
>
Why did today's updates go to u-boot/next, not u-boot/master?
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread* [U-Boot] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition
2014-03-28 2:34 ` Masahiro Yamada
@ 2014-03-28 15:42 ` Tom Rini
2014-03-31 2:12 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2014-03-28 15:42 UTC (permalink / raw)
To: u-boot
On Fri, Mar 28, 2014 at 11:34:49AM +0900, Masahiro Yamada wrote:
> Hi Tom,
>
> On Thu, 27 Mar 2014 13:00:19 -0400
> Tom Rini <trini@ti.com> wrote:
>
> > On Thu, Mar 13, 2014 at 07:48:57PM +0900, Masahiro Yamada wrote:
> >
> > > CONFIG_LEON is already defined in
> > > arch/sparc/cpu/{leon2,leon3}/config.mk.
> > > Remove the redundant definition in board header files.
> > >
> > > All leon3 boards define CONFIG_LEON3 in board header files.
> > > Move the definition to arch/sparc/cpu/leon3/config.mk.
> > >
> > > CONFIG_LEON2 can be move to arch/sparc/cpu/leon2/config.mk
> > > as well.
> > >
> > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > > Cc: Daniel Hellstrom <daniel@gaisler.com>
> >
> > Applied to u-boot/next, thanks!
>
> Why did today's updates go to u-boot/next, not u-boot/master?
I'm trying to slow down what's pulled in and since sparc doesn't build
for me today (unrelated to Kbuild), I figured I'd hold this one off for
the next release, while I was adding other stuff to /next anyhow.
--
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/20140328/62a1bff5/attachment.pgp>
^ permalink raw reply [flat|nested] 5+ messages in thread* [U-Boot] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition
2014-03-28 15:42 ` Tom Rini
@ 2014-03-31 2:12 ` Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2014-03-31 2:12 UTC (permalink / raw)
To: u-boot
Hi Tom,
On Fri, 28 Mar 2014 11:42:40 -0400
Tom Rini <trini@ti.com> wrote:
> On Fri, Mar 28, 2014 at 11:34:49AM +0900, Masahiro Yamada wrote:
>
> > Hi Tom,
> >
> > On Thu, 27 Mar 2014 13:00:19 -0400
> > Tom Rini <trini@ti.com> wrote:
> >
> > > On Thu, Mar 13, 2014 at 07:48:57PM +0900, Masahiro Yamada wrote:
> > >
> > > > CONFIG_LEON is already defined in
> > > > arch/sparc/cpu/{leon2,leon3}/config.mk.
> > > > Remove the redundant definition in board header files.
> > > >
> > > > All leon3 boards define CONFIG_LEON3 in board header files.
> > > > Move the definition to arch/sparc/cpu/leon3/config.mk.
> > > >
> > > > CONFIG_LEON2 can be move to arch/sparc/cpu/leon2/config.mk
> > > > as well.
> > > >
> > > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > > > Cc: Daniel Hellstrom <daniel@gaisler.com>
> > >
> > > Applied to u-boot/next, thanks!
> >
> > Why did today's updates go to u-boot/next, not u-boot/master?
>
> I'm trying to slow down what's pulled in and since sparc doesn't build
> for me today (unrelated to Kbuild), I figured I'd hold this one off for
> the next release, while I was adding other stuff to /next anyhow.
Thanks.
I just wanted to be sure because u-boot/next was touched
for the first time in the last one year.
BTW, all Sparc boards are broken
because of undefined reference to `get_tbclk'.
OK. I will shout in another thread.
I am using a simple way to work around this link error:
Adding
#define CONFIG_SYS_TIMER_RATE 0
to
include/configs/gr_cpci_ax2000.h
include/configs/gr_ep2s60.h
include/configs/gr_xc3s_1500.h
include/configs/grsim.h
include/configs/grsim_leon2.h
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-31 2:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-13 10:48 [U-Boot] [PATCH] sparc: consolidate CONFIG_{LEON, LEON2, LEON3} definition Masahiro Yamada
2014-03-27 17:00 ` [U-Boot] " Tom Rini
2014-03-28 2:34 ` Masahiro Yamada
2014-03-28 15:42 ` Tom Rini
2014-03-31 2:12 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox