Skip to contentSkip to conversation

Please pull u-boot-ppc4xx

U-Boot Stefan Roese 2 participants 3 messages Dec 21, 2009 – Dec 22, 2009

lore
Share & tools
lore
#0 lore raw

The following changes since commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9:
Shinya Kuribayashi (1):
MIPS: qemu_mips: Fix a build failure caused by missing <asm/unaligned.h>

are available in the git repository at:

git://www.denx.de/git/u-boot-ppc4xx.git master

Heiko Schocher (1):
i2c, ppc4xx: fix compiling KAREF and METROBOX boards.

Stefan Roese (1):
ppc4xx: alpr: Remove some not needed commands to make image fit again

 board/sandburst/common/ppc440gx_i2c.c |   73 +++++++++++++++++----------------
 board/sandburst/common/ppc440gx_i2c.h |   30 +++++++-------
 include/configs/alpr.h                |    2 -
 3 files changed, 53 insertions(+), 52 deletions(-)
#1 lore raw

Dear Stefan Roese,

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

The following changes since commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9:
Shinya Kuribayashi (1):
MIPS: qemu_mips: Fix a build failure caused by missing <asm/unaligned.h>

are available in the git repository at:

git://www.denx.de/git/u-boot-ppc4xx.git master

Heiko Schocher (1):
i2c, ppc4xx: fix compiling KAREF and METROBOX boards.

Quoted 7 lines

Stefan Roese (1):
ppc4xx: alpr: Remove some not needed commands to make image fit again

 board/sandburst/common/ppc440gx_i2c.c |   73 +++++++++++++++++----------------
 board/sandburst/common/ppc440gx_i2c.h |   30 +++++++-------
 include/configs/alpr.h                |    2 -
 3 files changed, 53 insertions(+), 52 deletions(-)

Umm.. you seem to have a strange commit in your repository. When pulling, I see this:

Merge made by recursive.

 board/sandburst/common/ppc440gx_i2c.c |   73 +++++++++++++++++----------------
 board/sandburst/common/ppc440gx_i2c.h |   30 +++++++-------
 include/asm-mips/unaligned.h          |   26 ++++++++++++
 include/configs/alpr.h                |    2 -
 4 files changed, 79 insertions(+), 52 deletions(-)
 create mode 100644 include/asm-mips/unaligned.h

Seems you have a MIPS commit in your tree:

	commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9
	Author: Shinya Kuribayashi <[email protected]>
	Date:   Fri Dec 18 19:32:13 2009 +0900

	    MIPS: qemu_mips: Fix a build failure caused by missing <asm/unaligned.h>

This does not seem right to me.

NOT pulled.

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
We fight only when there is no other choice. We prefer  the  ways  of
peaceful contact.
	-- Kirk, "Spectre of the Gun", stardate 4385.3
#2 lore raw

Hi Wolfgang,

Quoted 20 lines · On Monday 21 December 2009 21:06:31 Wolfgang Denk wrote:

Umm.. you seem to have a strange commit in your repository. When pulling, I see this:

Merge made by recursive.

 board/sandburst/common/ppc440gx_i2c.c |   73
 +++++++++++++++++----------------
 board/sandburst/common/ppc440gx_i2c.h | 
  30 +++++++-------
 include/asm-mips/unaligned.h          |   26 ++++++++++++
 include/configs/alpr.h                |    2 -
 4 files changed, 79 insertions(+), 52 deletions(-)
 create mode 100644 include/asm-mips/unaligned.h

Seems you have a MIPS commit in your tree:

	commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9
	Author: Shinya Kuribayashi <[email protected]>
	Date:   Fri Dec 18 19:32:13 2009 +0900

	    MIPS: qemu_mips: Fix a build failure caused by missing
Quoted 6 lines

<asm/unaligned.h>

This does not seem right to me.

NOT pulled.

Ups. Sorry. My fault. I'll fix this and send another pull request today.

Thanks for checking.

Cheers,
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