* [U-Boot] (no subject)
[not found] <[PATCH 1/5] coldfire: Change timer_init return type from void to int>
@ 2011-08-31 11:28 ` Stany MARCEL
2011-08-31 11:55 ` Stany MARCEL
2011-08-31 12:11 ` Wolfgang Denk
2011-08-31 11:28 ` [U-Boot] [PATCH v2 1/5] coldfire: Change timer_init return type from void to int Stany MARCEL
1 sibling, 2 replies; 6+ messages in thread
From: Stany MARCEL @ 2011-08-31 11:28 UTC (permalink / raw)
To: u-boot
Changes for v2:
- Remove extern of timer_init
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] (no subject)
2011-08-31 11:28 ` [U-Boot] (no subject) Stany MARCEL
@ 2011-08-31 11:55 ` Stany MARCEL
2011-08-31 12:11 ` Wolfgang Denk
1 sibling, 0 replies; 6+ messages in thread
From: Stany MARCEL @ 2011-08-31 11:55 UTC (permalink / raw)
To: u-boot
Sorry,
Manipulation errors with git send-email.
I did not correctly understand the --compose option, and my attempt to
use --in-reply-to seams to have also failed.
Regards
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] (no subject)
2011-08-31 11:28 ` [U-Boot] (no subject) Stany MARCEL
2011-08-31 11:55 ` Stany MARCEL
@ 2011-08-31 12:11 ` Wolfgang Denk
1 sibling, 0 replies; 6+ messages in thread
From: Wolfgang Denk @ 2011-08-31 12:11 UTC (permalink / raw)
To: u-boot
Dear Stany MARCEL,
In message <1314790136-8362-1-git-send-email-stany.marcel@novasys-ingenierie.com> you wrote:
> Changes for v2:
> - Remove extern of timer_init
What's this message supposed to be?
Please ALWAYS provide a reasonable Subject line.
And changelogs for patches must be submitted as part of the respective
patch, as documented here:
http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions
Best regards,
Wolfgang Denk
--
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
Vor allem kein Gedanke! Nichts ist kompromittierender als ein Gedan-
ke! - Friedrich Wilhelm Nietzsche _Der Fall Wagner_ (1888)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH v2 1/5] coldfire: Change timer_init return type from void to int
[not found] <[PATCH 1/5] coldfire: Change timer_init return type from void to int>
2011-08-31 11:28 ` [U-Boot] (no subject) Stany MARCEL
@ 2011-08-31 11:28 ` Stany MARCEL
2011-08-31 12:10 ` Wolfgang Denk
1 sibling, 1 reply; 6+ messages in thread
From: Stany MARCEL @ 2011-08-31 11:28 UTC (permalink / raw)
To: u-boot
timer_init protorype change for uniformization with other architectures
Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
---
arch/m68k/cpu/mcf547x_8x/slicetimer.c | 4 +++-
arch/m68k/lib/board.c | 2 --
arch/m68k/lib/time.c | 8 ++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 467a807..ee96aad 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -72,7 +72,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
@@ -93,6 +93,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and
enable timer and interrupt */
timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN;
+
+ return 0;
}
ulong get_timer(ulong base)
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 945ab66..1df50f1 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -78,8 +78,6 @@ static char *failed = "*** failed ***\n";
extern ulong __init_end;
extern ulong __bss_end__;
-extern void timer_init(void);
-
#if defined(CONFIG_WATCHDOG)
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
# define WATCHDOG_DISABLE watchdog_disable
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a316cdf..a1eb983 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -91,7 +91,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
@@ -114,6 +114,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and enable timer and interrupt */
timerp->tmr = CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
+
+ return 0;
}
ulong get_timer(ulong base)
@@ -153,7 +155,7 @@ void __udelay(unsigned long usec)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
timestamp = 0;
@@ -162,6 +164,8 @@ void timer_init(void)
timerp->pcsr = PIT_PCSR_OVW;
timerp->pmr = lastinc = 0;
timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
+
+ return 0;
}
ulong get_timer(ulong base)
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v2 1/5] coldfire: Change timer_init return type from void to int
2011-08-31 11:28 ` [U-Boot] [PATCH v2 1/5] coldfire: Change timer_init return type from void to int Stany MARCEL
@ 2011-08-31 12:10 ` Wolfgang Denk
0 siblings, 0 replies; 6+ messages in thread
From: Wolfgang Denk @ 2011-08-31 12:10 UTC (permalink / raw)
To: u-boot
Dear Stany MARCEL,
In message <1314790136-8362-2-git-send-email-stany.marcel@novasys-ingenierie.com> you wrote:
> timer_init protorype change for uniformization with other architectures
>
> Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
> ---
> arch/m68k/cpu/mcf547x_8x/slicetimer.c | 4 +++-
> arch/m68k/lib/board.c | 2 --
> arch/m68k/lib/time.c | 8 ++++++--
> 3 files changed, 9 insertions(+), 5 deletions(-)
Missing changelog (for the whole patch series), thus NAK.
Best regards,
Wolfgang Denk
--
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
Brontosaurus Principle: Organizations can grow faster than their
brains can manage them in relation to their environment and to their
own physiology: when this occurs, they are an endangered species.
- Thomas K. Connellan
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/5] coldfire: Change timer_init return type from void to int
@ 2011-08-30 13:00 stany MARCEL
2011-08-31 12:09 ` [U-Boot] [PATCH v2 " y at theia.denx.de
0 siblings, 1 reply; 6+ messages in thread
From: stany MARCEL @ 2011-08-30 13:00 UTC (permalink / raw)
To: u-boot
timer_init protorype change for uniformization with other architectures
Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
---
arch/m68k/cpu/mcf547x_8x/slicetimer.c | 4 +++-
arch/m68k/lib/board.c | 2 +-
arch/m68k/lib/time.c | 8 ++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 467a807..ee96aad 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -72,7 +72,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
@@ -93,6 +93,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and
enable timer and interrupt */
timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN;
+
+ return 0;
}
ulong get_timer(ulong base)
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 945ab66..694289e 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -78,7 +78,7 @@ static char *failed = "*** failed ***\n";
extern ulong __init_end;
extern ulong __bss_end__;
-extern void timer_init(void);
+extern int timer_init(void);
#if defined(CONFIG_WATCHDOG)
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a316cdf..a1eb983 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -91,7 +91,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
@@ -114,6 +114,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and enable timer and interrupt */
timerp->tmr = CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
+
+ return 0;
}
ulong get_timer(ulong base)
@@ -153,7 +155,7 @@ void __udelay(unsigned long usec)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
timestamp = 0;
@@ -162,6 +164,8 @@ void timer_init(void)
timerp->pcsr = PIT_PCSR_OVW;
timerp->pmr = lastinc = 0;
timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
+
+ return 0;
}
ulong get_timer(ulong base)
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH v2 1/5] coldfire: Change timer_init return type from void to int
2011-08-30 13:00 [U-Boot] [PATCH " stany MARCEL
@ 2011-08-31 12:09 ` y at theia.denx.de
0 siblings, 0 replies; 6+ messages in thread
From: y at theia.denx.de @ 2011-08-31 12:09 UTC (permalink / raw)
To: u-boot
From: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
timer_init protorype change for uniformization with other architectures
Signed-off-by: Stany MARCEL <stany.marcel@novasys-ingenierie.com>
---
Changes for v2:
- Remove extern of timer_init
arch/m68k/cpu/mcf547x_8x/slicetimer.c | 4 +++-
arch/m68k/lib/board.c | 2 --
arch/m68k/lib/time.c | 8 ++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 467a807..ee96aad 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -72,7 +72,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
@@ -93,6 +93,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and
enable timer and interrupt */
timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN;
+
+ return 0;
}
ulong get_timer(ulong base)
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 945ab66..1df50f1 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -78,8 +78,6 @@ static char *failed = "*** failed ***\n";
extern ulong __init_end;
extern ulong __bss_end__;
-extern void timer_init(void);
-
#if defined(CONFIG_WATCHDOG)
# define INIT_FUNC_WATCHDOG_INIT watchdog_init,
# define WATCHDOG_DISABLE watchdog_disable
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a316cdf..a1eb983 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -91,7 +91,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
@@ -114,6 +114,8 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and enable timer and interrupt */
timerp->tmr = CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
+
+ return 0;
}
ulong get_timer(ulong base)
@@ -153,7 +155,7 @@ void __udelay(unsigned long usec)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
timestamp = 0;
@@ -162,6 +164,8 @@ void timer_init(void)
timerp->pcsr = PIT_PCSR_OVW;
timerp->pmr = lastinc = 0;
timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
+
+ return 0;
}
ulong get_timer(ulong base)
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-31 12:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <[PATCH 1/5] coldfire: Change timer_init return type from void to int>
2011-08-31 11:28 ` [U-Boot] (no subject) Stany MARCEL
2011-08-31 11:55 ` Stany MARCEL
2011-08-31 12:11 ` Wolfgang Denk
2011-08-31 11:28 ` [U-Boot] [PATCH v2 1/5] coldfire: Change timer_init return type from void to int Stany MARCEL
2011-08-31 12:10 ` Wolfgang Denk
2011-08-30 13:00 [U-Boot] [PATCH " stany MARCEL
2011-08-31 12:09 ` [U-Boot] [PATCH v2 " y at theia.denx.de
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.