[U-Boot] please pull u-boot-avr32/master

[U-Boot] please pull u-boot-avr32/master

[Andreas Bießmann]

The following changes since commit 81316a902a2c76bc880ab49c6d157e3e9754806d:

  mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs (2012-08-13 14:34:44 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-avr32.git master

for you to fetch changes up to 5b80e07e87df9f5270d5c9a8a95881762b845d68:

  avr32: Remove redundant LDSCRIPT definition (2012-08-14 07:38:57 +0200)

----------------------------------------------------------------
Beno?t Th?baudeau (1):
      avr32: Remove redundant LDSCRIPT definition

 arch/avr32/config.mk |    2 --
 1 file changed, 2 deletions(-)

[U-Boot] please pull u-boot-avr32/master

[Andreas Bießmann]

Dear Wolfgang Denk,

please do not pull this. I have some more changes, but some need a
rebase on current u-boot-arm. So please first pull this one, then
trigger me to adopt my patch on top of it.

Best regards

Andreas Bie?mann

On 14.08.2012 10:21, Andreas Bie?mann wrote:
> The following changes since commit 81316a902a2c76bc880ab49c6d157e3e9754806d:
> 
>   mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs (2012-08-13 14:34:44 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-avr32.git master
> 
> for you to fetch changes up to 5b80e07e87df9f5270d5c9a8a95881762b845d68:
> 
>   avr32: Remove redundant LDSCRIPT definition (2012-08-14 07:38:57 +0200)
> 
> ----------------------------------------------------------------
> Beno?t Th?baudeau (1):
>       avr32: Remove redundant LDSCRIPT definition
> 
>  arch/avr32/config.mk |    2 --
>  1 file changed, 2 deletions(-)
> 

[U-Boot] please pull u-boot-avr32/master

[Albert ARIBAUD]

Hi Andreas,

On Thu, 16 Aug 2012 14:26:47 +0200, "Andreas Bie?mann"
<andreas.devel@googlemail.com> wrote:

> Dear Wolfgang Denk,
> 
> please do not pull this. I have some more changes, but some need a
> rebase on current u-boot-arm. So please first pull this one, then
> trigger me to adopt my patch on top of it.
> 
> Best regards
> 
> Andreas Bie?mann

Andreas, note that u-boot-arm/master is not currently rebased on
u-bmmt/master because of commit 8b5a02640adf7 which breaks some
twenty ARM boards. Daniel Schwierzeck is working on a fix.

Also, I am awaiting Tom Rini's branch from staging.

Amicalement,
-- 
Albert.

[U-Boot] please pull u-boot-avr32/master

[Andreas Bießmann]

Hi Albert,

On 16.08.2012 18:14, Albert ARIBAUD (U-Boot) wrote:
> Hi Andreas,
> 
> On Thu, 16 Aug 2012 14:26:47 +0200, "Andreas Bie?mann"
> <andreas.devel@googlemail.com> wrote:
> 
>> Dear Wolfgang Denk,
>>
>> please do not pull this. I have some more changes, but some need a
>> rebase on current u-boot-arm. So please first pull this one, then
>> trigger me to adopt my patch on top of it.
>>
>> Best regards
>>
>> Andreas Bie?mann
> 
> Andreas, note that u-boot-arm/master is not currently rebased on
> u-bmmt/master because of commit 8b5a02640adf7 which breaks some
> twenty ARM boards. Daniel Schwierzeck is working on a fix.

well, thats OK. I just want to say that there are some more patches on
the track for avr32. Also a new board was added which changes
MAINTAINERS. I would like to base that patch on
http://git.denx.de/?p=u-boot/u-boot-arm.git;a=commit;h=7d186b3c88daed359b8a58f35bd405d95b3905b8
which is currently not in u-boot/master.

So
a) this pull request is outdated
b) I need to rebase uu-boot-avr32/master on u-boot/master after
u-boot-arm/master gets merged

> Also, I am awaiting Tom Rini's branch from staging.

No problem for me. The MW closes this weekend and the release is in
about 60 days. So we should get it ;)

Best regards

Andreas Bie?mann

[U-Boot] please pull u-boot-avr32/master

[Tom Rini]

On Thu, Aug 16, 2012 at 06:14:01PM +0200, Albert ARIBAUD wrote:
> Hi Andreas,
> 
> On Thu, 16 Aug 2012 14:26:47 +0200, "Andreas Bie??mann"
> <andreas.devel@googlemail.com> wrote:
> 
> > Dear Wolfgang Denk,
> > 
> > please do not pull this. I have some more changes, but some need a
> > rebase on current u-boot-arm. So please first pull this one, then
> > trigger me to adopt my patch on top of it.
> > 
> > Best regards
> > 
> > Andreas Bie??mann
> 
> Andreas, note that u-boot-arm/master is not currently rebased on
> u-bmmt/master because of commit 8b5a02640adf7 which breaks some
> twenty ARM boards. Daniel Schwierzeck is working on a fix.
> 
> Also, I am awaiting Tom Rini's branch from staging.

To be clear, my staging branch should be good now.  If I need to do
anything else to it please let me know, I'm looking at gathering up
another group of patches today and putting them in another staging
branch for you.

-- 
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/20120817/bf37ab38/attachment.pgp>

[U-Boot] please pull u-boot-avr32/master

[Wolfgang Denk]

Dear Andreas,

In message <502D2AD3.3030204@gmail.com> you wrote:
> 
> So
> a) this pull request is outdated
> b) I need to rebase uu-boot-avr32/master on u-boot/master after
> u-boot-arm/master gets merged

OK, I ignored this, and wait for a new pull req.

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
This all sounds complicated, but it mostly does excatly what you  ex-
pect. It's just difficult for us to explain what you expect...
                       - L. Wall & R. L. Schwartz, _Programming Perl_

[U-Boot] Please pull u-boot-avr32/master

[Andreas Bießmann]

Dear Wolfgang Denk,

I'm a bit puzzled about the latest discussion regarding merge vs. rebase. I'm
afraid of creating merge commits so this is a first pull request for you to
get these changes into u-boot/master.

There are at least two more patches for this release. Namely the dlmalloc
thing I'm still working on and a new avr32 board which requires some changes
comming through u-boot-arm (d22f072f5dbfa21a3d5b2cf004bce3906ab62979).

The following changes since commit 27e301e5b7df6254c768d27130d3a36c31d55c96:

  CREDITS: Add credits for MCF5249 initialization code (2012-09-01 14:50:09 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-avr32.git master

for you to fetch changes up to 6ed0e940713d417f24fbc67898cea6f6ece4a0e1:

  net:macb: add line break (2012-09-03 23:39:11 +0200)

----------------------------------------------------------------
Andreas Bie?mann (2):
      avr32:portmux: fix setup for macb1
      net:macb: add line break

Beno?t Th?baudeau (1):
      avr32: Remove redundant LDSCRIPT definition

 arch/avr32/config.mk                |    2 --
 arch/avr32/cpu/at32ap700x/portmux.c |    2 +-
 drivers/net/macb.c                  |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

Best regards

Andreas Bie?mann

[U-Boot] Please pull u-boot-avr32/master

[Wolfgang Denk]

Dear Andreas Bie?mann,

In message <1346708952-13572-1-git-send-email-andreas.devel@googlemail.com> you wrote:
> 
> I'm a bit puzzled about the latest discussion regarding merge vs. rebase. I'm
> afraid of creating merge commits so this is a first pull request for you to
> get these changes into u-boot/master.

I have to admit that merge commits are still a puzzle to me.
Something must have changed in recent git versions, as I now actually
have to edit the commit message for these.


> There are at least two more patches for this release. Namely the dlmalloc
> thing I'm still working on and a new avr32 board which requires some changes
> comming through u-boot-arm (d22f072f5dbfa21a3d5b2cf004bce3906ab62979).
> 
> The following changes since commit 27e301e5b7df6254c768d27130d3a36c31d55c96:
> 
>   CREDITS: Add credits for MCF5249 initialization code (2012-09-01 14:50:09 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-avr32.git master
> 
> for you to fetch changes up to 6ed0e940713d417f24fbc67898cea6f6ece4a0e1:
> 
>   net:macb: add line break (2012-09-03 23:39:11 +0200)
> 
> ----------------------------------------------------------------
> Andreas Bie?mann (2):
>       avr32:portmux: fix setup for macb1
>       net:macb: add line break
> 
> Beno?t Th?baudeau (1):
>       avr32: Remove redundant LDSCRIPT definition
> 
>  arch/avr32/config.mk                |    2 --
>  arch/avr32/cpu/at32ap700x/portmux.c |    2 +-
>  drivers/net/macb.c                  |    2 +-
>  3 files changed, 2 insertions(+), 4 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
Q:  How do you tell if you're making  love  to  a  nurse,  a  school-
    teacher, or an airline stewardess?
A:  A nurse says: "This won't hurt  a  bit."  A  schoolteacher  says:
    "We're  going to have to do this over and over again until we get
    it right." An airline stewardess says: "Just hold this over  your
    mouth and nose, and breath normally."