From: Wolfgang Denk Date: Sun, 01 Feb 2009 21:30:18 +0100 Subject: [U-Boot] IXP Pull Request In-Reply-To: <20090131091848.GE9067@game.jcrosoft.org> References: <20090131091848.GE9067@game.jcrosoft.org> Message-ID: <20090201203018.6F23D8322908@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 Jean-Christophe PLAGNIOL-VILLARD, In message <20090131091848.GE9067@game.jcrosoft.org> you wrote: > Hi Wolfgang, > > Please pull The following changes since commit c1b7c70083fc8d0bb77db20dd47bb6c988f3dc67: > Wolfgang Denk (1): > Merge branch 'master' of git://git.denx.de/u-boot-nand-flash > > are available in the git repository at: > > git://git.denx.de/u-boot-ixp.git master > > Jean-Christophe PLAGNIOL-VILLARD (7): > ixp/npe: Move conditional compilation to Makefile > ixp: remove the option to include the Microcode > ixp: add missing os define > ixp: Move conditional compilation to Makefile > ixp: move pci drivers to drivers/pci > ixp: move pci init in arm/board instead of cpu > ixp: move serial to drivers/serial > > README | 3 +-- > cpu/ixp/Makefile | 12 ++++++++---- > cpu/ixp/cpu.c | 3 --- > cpu/ixp/npe/IxNpeDlImageMgr.c | 17 ++++++++--------- > cpu/ixp/npe/Makefile | 16 ++++++---------- > cpu/ixp/npe/npe.c | 4 ---- > cpu/ixp/timer.c | 2 -- > drivers/pci/Makefile | 1 + > cpu/ixp/pci.c => drivers/pci/pci_ixp.c | 4 ---- > drivers/serial/Makefile | 1 + > cpu/ixp/serial.c => drivers/serial/serial_ixp.c | 0 > include/configs/actux1.h | 4 ++-- > include/configs/actux2.h | 4 ++-- > include/configs/actux3.h | 4 ++-- > include/configs/actux4.h | 4 ++-- > include/configs/ixdp425.h | 2 ++ > include/configs/ixdpg425.h | 1 + > include/configs/pdnb3.h | 1 + > lib_arm/board.c | 12 ++++++++++++ > 19 files changed, 49 insertions(+), 46 deletions(-) > rename cpu/ixp/pci.c => drivers/pci/pci_ixp.c (99%) > rename cpu/ixp/serial.c => drivers/serial/serial_ixp.c (100%) 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 The sight of death frightens them [Earthers]. -- Kras the Klingon, "Friday's Child", stardate 3497.2