Message ID | 20121020015542.0a6b3220@lilith |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Sat, Oct 20, 2012 at 01:55:42AM +0200, Albert ARIBAUD wrote: > Hello Tom, > > The following changes since commit > bd23b22badadcdc414a900828253961fc5ec6c39: > > Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging > (2012-10-15 13:37:22 -0700) > > are available in the git repository at: > > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 39826f09978a0a7070999acc15babf88f03e4051: > > arm: fdt: Relocate fdt along with other data (2012-10-19 21:38:27 > +0200) > > ---------------------------------------------------------------- > 402jagan@gmail.com (1): > versatile: board configs: Use buffered writes on flash > > Albert ARIBAUD (1): > Remove lh7a40x cpu and serial driver > > Marek Vasut (2): > dm: wdt: arm: Move tnetv107x into drivers/watchdog/ > dm: Move s3c24xx USB driver to a proper place > > Simon Glass (1): > arm: fdt: Relocate fdt along with other data > > Tom Rini (1): > actux[123]: Update linker script for ELDK 4.2 > > ??ukasz Da??ek (1): > h2200: Add support for iPAQ h2200 palmtop > > MAINTAINERS | 4 + > arch/arm/cpu/arm1176/tnetv107x/Makefile | 2 +- > arch/arm/cpu/arm920t/s3c24x0/Makefile | 3 - > arch/arm/cpu/arm920t/s3c24x0/usb.c | 71 --- > arch/arm/cpu/lh7a40x/config.mk | 33 -- > arch/arm/cpu/lh7a40x/cpu.c | 65 --- > arch/arm/cpu/lh7a40x/speed.c | 83 ---- > arch/arm/cpu/lh7a40x/start.S | 506 > -------------------- > arch/arm/cpu/lh7a40x/timer.c | 182 ------- > arch/arm/lib/board.c | 22 + > board/actux1/u-boot.lds | 2 +- > board/actux2/u-boot.lds | 2 +- > board/actux3/u-boot.lds | 2 +- > {arch/arm/cpu/lh7a40x => board/h2200}/Makefile | 26 +- > board/h2200/h2200-header.S | 27 ++ > board/h2200/h2200.c | 53 ++ > boards.cfg | 1 + > doc/driver-model/UDM-serial.txt | 32 +- > drivers/serial/Makefile | 1 - > drivers/serial/serial_lh7a40x.c | 204 -------- > drivers/usb/gadget/gadget_chips.h | 34 +- > drivers/usb/host/Makefile | 1 > + .../usb_ohci.c => drivers/usb/host/ohci-s3c24xx.c | 46 > +- .../usb_ohci.h => drivers/usb/host/ohci-s3c24xx.h | 0 > drivers/watchdog/Makefile | 1 + .../wdt.c > => drivers/watchdog/tnetv107x_wdt.c | 0 > include/configs/VCMA9.h | 1 + > include/configs/ca9x4_ct_vxp.h | 2 + > include/configs/h2200.h | 157 ++++++ > include/configs/smdk2410.h | 1 + > include/configs/tnetv107x_evm.h | 1 + > include/configs/versatile.h | 1 + > include/lh7a400.h | 75 --- > include/lh7a404.h | 83 ---- > include/lh7a40x.h | 279 ----------- > include/lpd7a400_cpld.h | 195 -------- 36 > files changed, 362 insertions(+), 1836 deletions(-) delete mode 100644 > arch/arm/cpu/arm920t/s3c24x0/usb.c delete mode 100644 > arch/arm/cpu/lh7a40x/config.mk delete mode 100644 > arch/arm/cpu/lh7a40x/cpu.c delete mode 100644 > arch/arm/cpu/lh7a40x/speed.c delete mode 100644 > arch/arm/cpu/lh7a40x/start.S delete mode 100644 > arch/arm/cpu/lh7a40x/timer.c rename {arch/arm/cpu/lh7a40x => > board/h2200}/Makefile (71%) create mode 100644 > board/h2200/h2200-header.S create mode 100644 board/h2200/h2200.c > delete mode 100644 drivers/serial/serial_lh7a40x.c > rename arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c => > drivers/usb/host/ohci-s3c24xx.c (97%) rename > arch/arm/cpu/arm920t/s3c24x0/usb_ohci.h => > drivers/usb/host/ohci-s3c24xx.h (100%) rename > arch/arm/cpu/arm1176/tnetv107x/wdt.c => > drivers/watchdog/tnetv107x_wdt.c (100%) create mode 100644 > include/configs/h2200.h delete mode 100644 include/lh7a400.h delete > mode 100644 include/lh7a404.h delete mode 100644 include/lh7a40x.h > delete mode 100644 include/lpd7a400_cpld.h Applied to u-boot/master with a trivial conflict fixed up, thanks!