| Message ID | 50F3C477.1090901@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Stefano, On Mon, 14 Jan 2013 09:40:23 +0100, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > please pull from u-boot-imx (last fixes), thanks. > > The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d: > > Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 > 14:59:37 +0100) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to 11d80af4876b609832856853b63d06a1011bccf1: > > mx51evk: Add DVI output support (2013-01-13 12:06:35 +0100) > > ---------------------------------------------------------------- > Fabio Estevam (4): > mx6: Add workaround for ARM errata > mx53loco: Add support for SEIKO 4.3'' WVGA panel > mx6qsabresd: Fix booting the kernel from SDHC3 > mx51evk: Add DVI output support > > Otavio Salvador (6): > mx6qsabrelite: Use tabs to environment setting > mx28evk: We shouldn't hardcode a rootfs filesystem type > mx28evk: Add support to dynamically choose between fdt use or not > mx53loco: Add support to dynamically choose between fdt use or not > mx6qsabrelite: Add support to dynamically choose between fdt use > or not > mx6qsabre{auto, sd}: Add support to dynamically choose between fdt > use or not > > Troy Kisky (1): > mx31/mx35/mx51/mx53/mx6: add watchdog > > arch/arm/cpu/arm1136/mx31/timer.c | 39 ----------- > arch/arm/cpu/arm1136/mx35/generic.c | 6 -- > arch/arm/cpu/armv7/mx6/lowlevel_init.S | 10 +++ > arch/arm/imx-common/cpu.c | 5 -- > arch/arm/include/asm/arch-mx31/clock.h | 2 - > arch/arm/include/asm/arch-mx31/imx-regs.h | 13 +--- > arch/arm/include/asm/arch-mx35/imx-regs.h | 11 +--- > arch/arm/include/asm/arch-mx5/imx-regs.h | 10 --- > board/davedenx/qong/qong.c | 9 +-- > board/freescale/mx31pdk/mx31pdk.c | 9 +-- > board/freescale/mx51evk/mx51evk.c | 2 - > board/freescale/mx51evk/mx51evk_video.c | 39 ++++++++++- > board/freescale/mx53loco/mx53loco.c | 2 - > board/freescale/mx53loco/mx53loco_video.c | 38 ++++++++++- > board/hale/tt01/tt01.c | 2 +- > doc/README.watchdog | 29 +++++++++ > drivers/watchdog/Makefile | 3 + > drivers/watchdog/imx_watchdog.c | 66 +++++++++++++++++++ > include/configs/mx28evk.h | 47 ++++++++++++-- > include/configs/mx31pdk.h | 1 + > include/configs/mx53loco.h | 44 +++++++++++-- > include/configs/mx6qsabre_common.h | 43 ++++++++++-- > include/configs/mx6qsabreauto.h | 1 + > include/configs/mx6qsabrelite.h | 101 > +++++++++++++++++++---------- > include/configs/mx6qsabresd.h | 3 +- > include/configs/qong.h | 1 + > include/watchdog.h | 1 + > 27 files changed, 377 insertions(+), 160 deletions(-) > create mode 100644 doc/README.watchdog > create mode 100644 drivers/watchdog/imx_watchdog.c > > > Applied to u-boot-arm/master, thanks! Amicalement,
Hi Albert, please pull from u-boot-imx (last fixes), thanks. The following changes since commit 7528cf5f016b5b8b8b12b373f6f31a10bf89233d: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-08 14:59:37 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 11d80af4876b609832856853b63d06a1011bccf1: mx51evk: Add DVI output support (2013-01-13 12:06:35 +0100) ---------------------------------------------------------------- Fabio Estevam (4): mx6: Add workaround for ARM errata mx53loco: Add support for SEIKO 4.3'' WVGA panel mx6qsabresd: Fix booting the kernel from SDHC3 mx51evk: Add DVI output support Otavio Salvador (6): mx6qsabrelite: Use tabs to environment setting mx28evk: We shouldn't hardcode a rootfs filesystem type mx28evk: Add support to dynamically choose between fdt use or not mx53loco: Add support to dynamically choose between fdt use or not mx6qsabrelite: Add support to dynamically choose between fdt use or not mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not Troy Kisky (1): mx31/mx35/mx51/mx53/mx6: add watchdog arch/arm/cpu/arm1136/mx31/timer.c | 39 ----------- arch/arm/cpu/arm1136/mx35/generic.c | 6 -- arch/arm/cpu/armv7/mx6/lowlevel_init.S | 10 +++ arch/arm/imx-common/cpu.c | 5 -- arch/arm/include/asm/arch-mx31/clock.h | 2 - arch/arm/include/asm/arch-mx31/imx-regs.h | 13 +--- arch/arm/include/asm/arch-mx35/imx-regs.h | 11 +--- arch/arm/include/asm/arch-mx5/imx-regs.h | 10 --- board/davedenx/qong/qong.c | 9 +-- board/freescale/mx31pdk/mx31pdk.c | 9 +-- board/freescale/mx51evk/mx51evk.c | 2 - board/freescale/mx51evk/mx51evk_video.c | 39 ++++++++++- board/freescale/mx53loco/mx53loco.c | 2 - board/freescale/mx53loco/mx53loco_video.c | 38 ++++++++++- board/hale/tt01/tt01.c | 2 +- doc/README.watchdog | 29 +++++++++ drivers/watchdog/Makefile | 3 + drivers/watchdog/imx_watchdog.c | 66 +++++++++++++++++++ include/configs/mx28evk.h | 47 ++++++++++++-- include/configs/mx31pdk.h | 1 + include/configs/mx53loco.h | 44 +++++++++++-- include/configs/mx6qsabre_common.h | 43 ++++++++++-- include/configs/mx6qsabreauto.h | 1 + include/configs/mx6qsabrelite.h | 101 +++++++++++++++++++---------- include/configs/mx6qsabresd.h | 3 +- include/configs/qong.h | 1 + include/watchdog.h | 1 + 27 files changed, 377 insertions(+), 160 deletions(-) create mode 100644 doc/README.watchdog create mode 100644 drivers/watchdog/imx_watchdog.c