* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
@ 2008-08-29 20:14 John Rigby
2008-08-31 21:53 ` Wolfgang Denk
0 siblings, 1 reply; 9+ messages in thread
From: John Rigby @ 2008-08-29 20:14 UTC (permalink / raw)
To: u-boot
Wolfgang,
The following changes since commit 33aa4eac66b71c797bbc13b3afe432a2132947d4:
Wolfgang Denk (1):
Merge branch 'master' of /home/wd/git/u-boot/custodians
are available in the git repository at:
git://git.denx.de/u-boot-mpc5xxx.git master
Ben Warren (2):
Move MPC5xxx_FEC driver to drivers/net
Move MPC512x_FEC driver to drivers/net
John Rigby (1):
ADS5121: Fix NOR and CPLD ALE timing for rev 2 silicon
board/ads5121/ads5121.c | 4 ++++
cpu/mpc512x/Makefile | 2 +-
cpu/mpc5xxx/Makefile | 2 +-
drivers/net/Makefile | 2 ++
cpu/mpc512x/fec.c => drivers/net/mpc512x_fec.c | 2 +-
cpu/mpc512x/fec.h => drivers/net/mpc512x_fec.h | 0
cpu/mpc5xxx/fec.c => drivers/net/mpc5xxx_fec.c | 4 ++--
cpu/mpc5xxx/fec.h => drivers/net/mpc5xxx_fec.h | 4 ----
include/configs/ads5121.h | 1 +
include/mpc512x.h | 1 +
cpu/mpc5xxx/sdma.h => include/mpc5xxx_sdma.h | 0
11 files changed, 13 insertions(+), 9 deletions(-)
rename cpu/mpc512x/fec.c => drivers/net/mpc512x_fec.c (99%)
rename cpu/mpc512x/fec.h => drivers/net/mpc512x_fec.h (100%)
rename cpu/mpc5xxx/fec.c => drivers/net/mpc5xxx_fec.c (99%)
rename cpu/mpc5xxx/fec.h => drivers/net/mpc5xxx_fec.h (99%)
rename cpu/mpc5xxx/sdma.h => include/mpc5xxx_sdma.h (100%)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
2008-08-29 20:14 John Rigby
@ 2008-08-31 21:53 ` Wolfgang Denk
0 siblings, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2008-08-31 21:53 UTC (permalink / raw)
To: u-boot
Dear John Rigby,
In message <48B858AD.2040006@freescale.com> you wrote:
> Wolfgang,
>
> The following changes since commit 33aa4eac66b71c797bbc13b3afe432a2132947d4:
> Wolfgang Denk (1):
> Merge branch 'master' of /home/wd/git/u-boot/custodians
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-mpc5xxx.git master
>
> Ben Warren (2):
> Move MPC5xxx_FEC driver to drivers/net
> Move MPC512x_FEC driver to drivers/net
>
> John Rigby (1):
> ADS5121: Fix NOR and CPLD ALE timing for rev 2 silicon
>
> board/ads5121/ads5121.c | 4 ++++
> cpu/mpc512x/Makefile | 2 +-
> cpu/mpc5xxx/Makefile | 2 +-
> drivers/net/Makefile | 2 ++
> cpu/mpc512x/fec.c => drivers/net/mpc512x_fec.c | 2 +-
> cpu/mpc512x/fec.h => drivers/net/mpc512x_fec.h | 0
> cpu/mpc5xxx/fec.c => drivers/net/mpc5xxx_fec.c | 4 ++--
> cpu/mpc5xxx/fec.h => drivers/net/mpc5xxx_fec.h | 4 ----
> include/configs/ads5121.h | 1 +
> include/mpc512x.h | 1 +
> cpu/mpc5xxx/sdma.h => include/mpc5xxx_sdma.h | 0
> 11 files changed, 13 insertions(+), 9 deletions(-)
> rename cpu/mpc512x/fec.c => drivers/net/mpc512x_fec.c (99%)
> rename cpu/mpc512x/fec.h => drivers/net/mpc512x_fec.h (100%)
> rename cpu/mpc5xxx/fec.c => drivers/net/mpc5xxx_fec.c (99%)
> rename cpu/mpc5xxx/fec.h => drivers/net/mpc5xxx_fec.h (99%)
> rename cpu/mpc5xxx/sdma.h => include/mpc5xxx_sdma.h (100%)
Done, thanks.
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
The moral of the story is: "Don't stop to tighten your shoe laces
during the Olympics 100m finals".
- Kevin Jones in <DEJo68.K1t@bri.hp.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
@ 2009-02-03 16:55 John Rigby
2009-02-03 22:27 ` Wolfgang Denk
0 siblings, 1 reply; 9+ messages in thread
From: John Rigby @ 2009-02-03 16:55 UTC (permalink / raw)
To: u-boot
Wolfgang,
The following changes since commit 92c20fbd3a7788c1a154f50a3f44f28a7763f99a:
John Rigby (1):
ADS5121 DIU Make inclusion of FSL logo optional
are available in the git repository at:
http://git.denx.de/u-boot-mpc5xxx.git master
John Rigby (3):
ADS5121 DIU Add diu_bmp_addr env
ADS5121 Fix rev2 silicon pci iopad config
ADS5121 Add IC Ident Module (IIM) support
Ralph Kondziella (1):
ADS5121 Add PATA support
board/ads5121/ads5121.c | 120 +++++++++++++-
board/ads5121/ads5121_diu.c | 28 +++-
common/cmd_ide.c | 4 +
cpu/mpc512x/Makefile | 3 +
cpu/mpc512x/iim.c | 394 ++++++++++++++++++++++++++++++++++++++++++
include/asm-ppc/immap_512x.h | 49 +++++-
include/configs/ads5121.h | 58 ++++++
include/mpc512x.h | 25 +++
8 files changed, 676 insertions(+), 5 deletions(-)
create mode 100644 cpu/mpc512x/iim.c
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
2009-02-03 16:55 John Rigby
@ 2009-02-03 22:27 ` Wolfgang Denk
2009-02-03 22:38 ` John Rigby
0 siblings, 1 reply; 9+ messages in thread
From: Wolfgang Denk @ 2009-02-03 22:27 UTC (permalink / raw)
To: u-boot
Dear John,
In message <498876F3.2070809@freescale.com> you wrote:
> Wolfgang,
>
> The following changes since commit 92c20fbd3a7788c1a154f50a3f44f28a7763f99a:
> John Rigby (1):
> ADS5121 DIU Make inclusion of FSL logo optional
>
> are available in the git repository at:
>
> http://git.denx.de/u-boot-mpc5xxx.git master
>
> John Rigby (3):
> ADS5121 DIU Add diu_bmp_addr env
> ADS5121 Fix rev2 silicon pci iopad config
> ADS5121 Add IC Ident Module (IIM) support
>
> Ralph Kondziella (1):
> ADS5121 Add PATA support
Sorry, but I hesitate pulling this. Commit 430b071b09 in your tree
shows:
Author: John Rigby <jrigby@freescale.com> 2009-01-26 18:45:07
Committer: John Rigby <jrigby@freescale.com> 2009-02-03 17:28:40
ADS5121 Add IC Ident Module (IIM) support
To me it seems to match to
Subject: [U-Boot] [PATCH] Add IC Identif Module (IIM) support
for ADS5121
From: Martha Marx <mmarx@silicontkx.com>
Date: Sat, 11 Oct 2008 15:34:22 -0400
To: u-boot at lists.denx.de
so I would expect to see Martha listed as author? I am aware of your
reposted patch
Subject: [PATCH 4/5] ADS5121 Add IC Ident Module (IIM) support
From: John Rigby <jrigby@freescale.com>
Date: Mon, 26 Jan 2009 13:07:07 -0700
To: u-boot at lists.denx.de, ...
but I feel authorship should be preserved here.
What do you think?
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
I don't care if you *ARE* on a bondage-and-discipline post-technical
system pawned off by the nation's largest oughta-be-illegal monopoly
who cannot escape the sins of their forefathers -- namely, using the
wrong slash for directories when the C language and its brethren use
it for something else that's very important.
-- Tom Christiansen in <55oabg$1j1$1@csnews.cs.colorado.edu>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
2009-02-03 22:27 ` Wolfgang Denk
@ 2009-02-03 22:38 ` John Rigby
0 siblings, 0 replies; 9+ messages in thread
From: John Rigby @ 2009-02-03 22:38 UTC (permalink / raw)
To: u-boot
Wolfgang,
You are right, in some rebasing I neglected to include the --author. I
will fix this and send a new pull req.
John
Wolfgang Denk wrote:
> Dear John,
>
> In message <498876F3.2070809@freescale.com> you wrote:
>
>> Wolfgang,
>>
>> The following changes since commit 92c20fbd3a7788c1a154f50a3f44f28a7763f99a:
>> John Rigby (1):
>> ADS5121 DIU Make inclusion of FSL logo optional
>>
>> are available in the git repository at:
>>
>> http://git.denx.de/u-boot-mpc5xxx.git master
>>
>> John Rigby (3):
>> ADS5121 DIU Add diu_bmp_addr env
>> ADS5121 Fix rev2 silicon pci iopad config
>> ADS5121 Add IC Ident Module (IIM) support
>>
>> Ralph Kondziella (1):
>> ADS5121 Add PATA support
>>
>
> Sorry, but I hesitate pulling this. Commit 430b071b09 in your tree
> shows:
>
> Author: John Rigby <jrigby@freescale.com> 2009-01-26 18:45:07
> Committer: John Rigby <jrigby@freescale.com> 2009-02-03 17:28:40
>
> ADS5121 Add IC Ident Module (IIM) support
>
> To me it seems to match to
>
> Subject: [U-Boot] [PATCH] Add IC Identif Module (IIM) support
> for ADS5121
> From: Martha Marx <mmarx@silicontkx.com>
> Date: Sat, 11 Oct 2008 15:34:22 -0400
> To: u-boot at lists.denx.de
>
> so I would expect to see Martha listed as author? I am aware of your
> reposted patch
>
> Subject: [PATCH 4/5] ADS5121 Add IC Ident Module (IIM) support
> From: John Rigby <jrigby@freescale.com>
> Date: Mon, 26 Jan 2009 13:07:07 -0700
> To: u-boot at lists.denx.de, ...
>
> but I feel authorship should be preserved here.
>
> What do you think?
>
>
>
>
> Best regards,
>
> Wolfgang Denk
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
@ 2009-02-03 22:43 John Rigby
2009-02-07 21:10 ` Wolfgang Denk
0 siblings, 1 reply; 9+ messages in thread
From: John Rigby @ 2009-02-03 22:43 UTC (permalink / raw)
To: u-boot
The following changes since commit 92c20fbd3a7788c1a154f50a3f44f28a7763f99a:
John Rigby (1):
ADS5121 DIU Make inclusion of FSL logo optional
are available in the git repository at:
http://git.denx.de/u-boot-mpc5xxx.git master
John Rigby (2):
ADS5121 DIU Add diu_bmp_addr env
ADS5121 Fix rev2 silicon pci iopad config
Martha Marx (1):
ADS5121 Add IC Ident Module (IIM) support
Ralph Kondziella (1):
ADS5121 Add PATA support
board/ads5121/ads5121.c | 120 +++++++++++++-
board/ads5121/ads5121_diu.c | 28 +++-
common/cmd_ide.c | 4 +
cpu/mpc512x/Makefile | 3 +
cpu/mpc512x/iim.c | 394 ++++++++++++++++++++++++++++++++++++++++++
include/asm-ppc/immap_512x.h | 49 +++++-
include/configs/ads5121.h | 58 ++++++
include/mpc512x.h | 25 +++
8 files changed, 676 insertions(+), 5 deletions(-)
create mode 100644 cpu/mpc512x/iim.c
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
2009-02-03 22:43 John Rigby
@ 2009-02-07 21:10 ` Wolfgang Denk
0 siblings, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-02-07 21:10 UTC (permalink / raw)
To: u-boot
Dear John Rigby,
In message <4988C87E.4090006@freescale.com> you wrote:
> The following changes since commit 92c20fbd3a7788c1a154f50a3f44f28a7763f99a:
> John Rigby (1):
> ADS5121 DIU Make inclusion of FSL logo optional
>
> are available in the git repository at:
>
> http://git.denx.de/u-boot-mpc5xxx.git master
>
> John Rigby (2):
> ADS5121 DIU Add diu_bmp_addr env
> ADS5121 Fix rev2 silicon pci iopad config
>
> Martha Marx (1):
> ADS5121 Add IC Ident Module (IIM) support
>
> Ralph Kondziella (1):
> ADS5121 Add PATA support
>
> board/ads5121/ads5121.c | 120 +++++++++++++-
> board/ads5121/ads5121_diu.c | 28 +++-
> common/cmd_ide.c | 4 +
> cpu/mpc512x/Makefile | 3 +
> cpu/mpc512x/iim.c | 394 ++++++++++++++++++++++++++++++++++++++++++
> include/asm-ppc/immap_512x.h | 49 +++++-
> include/configs/ads5121.h | 58 ++++++
> include/mpc512x.h | 25 +++
> 8 files changed, 676 insertions(+), 5 deletions(-)
> create mode 100644 cpu/mpc512x/iim.c
Applied, thanks.
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
Blast medicine anyway! We've learned to tie into every organ in the
human body but one. The brain! The brain is what life is all about.
-- McCoy, "The Menagerie", stardate 3012.4
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
@ 2009-03-13 16:28 John Rigby
2009-03-15 21:03 ` Wolfgang Denk
0 siblings, 1 reply; 9+ messages in thread
From: John Rigby @ 2009-03-13 16:28 UTC (permalink / raw)
To: u-boot
The following changes since commit 3c92217732edfc0016c3cbdc828471d013d23a36:
Wolfgang Denk (1):
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
are available in the git repository at:
git://git.denx.de/u-boot-mpc5xxx.git master
Jon Smirl (1):
MPC5200 FEC MII speed register
drivers/net/mpc5xxx_fec.c | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [GIT PULL] Please pull mpc5xxx tree
2009-03-13 16:28 [U-Boot] [GIT PULL] Please pull mpc5xxx tree John Rigby
@ 2009-03-15 21:03 ` Wolfgang Denk
0 siblings, 0 replies; 9+ messages in thread
From: Wolfgang Denk @ 2009-03-15 21:03 UTC (permalink / raw)
To: u-boot
Dear John Rigby,
In message <49BA89AD.9040005@freescale.com> you wrote:
> The following changes since commit 3c92217732edfc0016c3cbdc828471d013d23a36:
> Wolfgang Denk (1):
> Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
>
> are available in the git repository at:
>
> git://git.denx.de/u-boot-mpc5xxx.git master
>
> Jon Smirl (1):
> MPC5200 FEC MII speed register
>
> drivers/net/mpc5xxx_fec.c | 23 ++++++++++++++++-------
> 1 files changed, 16 insertions(+), 7 deletions(-)
Applied, thanks.
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
After a time, you may find that "having" is not so pleasing a thing,
after all, as "wanting." It is not logical, but it is often true.
-- Spock, "Amok Time", stardate 3372.7
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-03-15 21:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-13 16:28 [U-Boot] [GIT PULL] Please pull mpc5xxx tree John Rigby
2009-03-15 21:03 ` Wolfgang Denk
-- strict thread matches above, loose matches on Subject: below --
2009-02-03 22:43 John Rigby
2009-02-07 21:10 ` Wolfgang Denk
2009-02-03 16:55 John Rigby
2009-02-03 22:27 ` Wolfgang Denk
2009-02-03 22:38 ` John Rigby
2008-08-29 20:14 John Rigby
2008-08-31 21:53 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox