From: Wolfgang Denk Date: Mon, 21 Dec 2009 21:06:31 +0100 Subject: [U-Boot] Please pull u-boot-ppc4xx In-Reply-To: <200912211033.15987.sr@denx.de> References: <200912211033.15987.sr@denx.de> Message-ID: <20091221200631.94DF43F6EF@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Stefan Roese, In message <200912211033.15987.sr@denx.de> you wrote: > The following changes since commit 223e97641cd60abed95dc7a6dd15d8fdf0951ff9: > Shinya Kuribayashi (1): > MIPS: qemu_mips: Fix a build failure caused by missing > > 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(-) 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 Date: Fri Dec 18 19:32:13 2009 +0900 MIPS: qemu_mips: Fix a build failure caused by missing This does not seem right to me. NOT pulled. 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 We fight only when there is no other choice. We prefer the ways of peaceful contact. -- Kirk, "Spectre of the Gun", stardate 4385.3