Hi Wolfgang, Le 23/06/2011 15:40, Wolfgang Denk a écrit : > Dear Albert ARIBAUD, > > In message<4e02de75.7030...@aribaud.net> you wrote: >> (forgot to Cc: the lits, sorry for the duplicate) >> >> Hi Wolfgang, >> >> The following changes since commit 79cfe422615c010a75ece41662a05cd432ada389: >> >> Prepare v2011.06-rc3 (2011-06-22 11:39:24 +0200) >> >> are available in the git repository at: >> git://git.denx.de/u-boot-arm.git master >> >> Michael Schwingen (17): >> add XScale sub architecture (IXP/PXA) to maintainer list >> add support for IXP42x Rev. B1 and newer >> trigger hardware watchdog in IXP42x serial driver >> Fix IXP code to work after relocation was added >> fix "depend" target in npe directory >> support CONFIG_SYS_LDSCRIPT on ARM >> use -ffunction-sections / --gc-sections on IXP42x >> update/fix AcTux1 board >> update/fix AcTux2 board >> update/fix AcTux3 board >> update/fix AcTux4 board >> IXP NPE: add support for fixed-speed MII ports >> add dvlhost (dLAN 200 AV Wireless G) board >> update/fix IXDP425 / IXDPG425 boards >> update/fix PDNB3 board >> IXP42x PCI rewrite >> run arm_pci_init after relocation >> >> MAINTAINERS | 45 ++- >> arch/arm/config.mk | 7 + >> arch/arm/cpu/ixp/config.mk | 5 + >> arch/arm/cpu/ixp/cpu.c | 5 - >> arch/arm/cpu/ixp/npe/Makefile | 1 + >> arch/arm/cpu/ixp/npe/npe.c | 74 +++-- >> arch/arm/cpu/ixp/start.S | 59 +--- >> arch/arm/cpu/ixp/timer.c | 124 +++--- >> arch/arm/cpu/ixp/u-boot.lds | 8 +- >> arch/arm/include/asm/arch-ixp/ixp425.h | 5 +- >> arch/arm/include/asm/arch-ixp/ixp425pci.h | 130 +------ >> arch/arm/include/asm/global_data.h | 3 + >> arch/arm/lib/board.c | 6 +- >> board/actux1/actux1.c | 105 +++--- >> board/actux1/config.mk | 4 - >> board/actux1/u-boot.lds | 41 ++- >> board/actux2/actux2.c | 93 +++--- >> board/actux2/config.mk | 4 - >> board/actux2/u-boot.lds | 46 ++- >> board/actux3/actux3.c | 120 +++--- >> board/actux3/config.mk | 4 - >> board/actux3/u-boot.lds | 52 ++- >> board/actux4/actux4.c | 103 +++-- >> board/actux4/config.mk | 4 - >> board/dvlhost/Makefile | 50 +++ >> board/dvlhost/dvlhost.c | 130 ++++++ >> board/dvlhost/dvlhost_hw.h | 47 +++ >> board/dvlhost/u-boot.lds | 87 ++++ >> board/dvlhost/watchdog.c | 43 ++ >> board/ixdp425/config.mk | 2 - >> board/ixdp425/flash.c | 427 -------------------- >> board/ixdp425/ixdp425.c | 155 +++++++- >> board/prodrive/pdnb3/config.mk | 2 - >> boards.cfg | 8 +- >> drivers/pci/pci.c | 4 - >> drivers/pci/pci_indirect.c | 13 +- >> drivers/pci/pci_ixp.c | 612 >> ++++++++++------------------- >> drivers/serial/serial_ixp.c | 7 +- >> include/configs/actux1.h | 62 ++-- >> include/configs/actux2.h | 35 ++- >> include/configs/actux3.h | 37 ++- >> include/configs/actux4.h | 39 ++- >> include/configs/dvlhost.h | 248 ++++++++++++ >> include/configs/ixdp425.h | 196 +++++++--- >> include/configs/ixdpg425.h | 11 +- >> include/configs/pdnb3.h | 10 +- >> 46 files changed, 1689 insertions(+), 1584 deletions(-) >> delete mode 100644 board/actux1/config.mk >> delete mode 100644 board/actux2/config.mk >> delete mode 100644 board/actux3/config.mk >> delete mode 100644 board/actux4/config.mk >> create mode 100644 board/dvlhost/Makefile >> create mode 100644 board/dvlhost/dvlhost.c >> create mode 100644 board/dvlhost/dvlhost_hw.h >> create mode 100644 board/dvlhost/u-boot.lds >> create mode 100644 board/dvlhost/watchdog.c >> delete mode 100644 board/ixdp425/config.mk >> delete mode 100644 board/ixdp425/flash.c >> delete mode 100644 board/prodrive/pdnb3/config.mk >> create mode 100644 include/configs/dvlhost.h > > Applied, thanks. I had to fix a merge conflict in > arch/arm/lib/board.c (due to the removal of the trab board > inbetween), so please verify.
Seems ok to me, thanks. > Best regards, > > Wolfgang Denk Amicalement, -- Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot