[U-Boot] [GIT PULL] Pull request: u-boot-imx

Albert ARIBAUD
2011-12-09T16:40:23Z

Hi Stefano,

Le 09/12/2011 15:34, Stefano Babic a ?crit :
> Hi Albert,
>
> please pull from u-boot-imx. It is rebased on u-boot mainline, because
> Wolfgang has already merged your u-boot-arm/master + some fixes.
>
> The following changes since commit d82a27bc5c404da907f71960a3ed2e148ac73fd0:
>
> drivers/net/inca-ip_sw.c: Fix GCC 4.6 build warning (2011-12-08
> 21:01:19 +0100)
>
> are available in the git repository at:
> git://www.denx.de/git/u-boot-imx.git master
>
> Jason Liu (4):
> i.mx: introduce the armv7/imx-common folder
> i.mx: add the initial support for freescale i.MX6Q processor
> i.mx: mxc_gpio: add the i.mx6q support
> i.mx: i.mx6q: add the initial support for i.mx6q ARM2 board
>
> Marek Vasut (4):
> M28: Document that units has to be set to sectors on SD bootcard
> M28: Fix typo
> i.MX28: Move SPL to arch/arm/cpu/arm926ejs/mx28
> M28: Cleanup memsize.o OOT build
>
> MAINTAINERS | 1 +
> Makefile | 8 +
> arch/arm/cpu/arm926ejs/mx28/Makefile | 4 +
> .../arm/cpu/arm926ejs/mx28/mx28_init.h | 0
> arch/arm/cpu/arm926ejs/mx28/spl_boot.c | 78 +
> .../arm/cpu/arm926ejs/mx28/spl_mem_init.c | 2 +-
> .../arm/cpu/arm926ejs/mx28/spl_power_init.c | 2 +-
> .../m28evk => arch/arm/cpu/arm926ejs/mx28}/start.S | 0
> .../arm/cpu/arm926ejs/mx28}/u-boot-spl.lds | 14 +-
> arch/arm/cpu/armv7/imx-common/Makefile | 47 +
> arch/arm/cpu/armv7/imx-common/cpu.c | 108 ++
> arch/arm/cpu/armv7/{mx5 => imx-common}/speed.c | 0
> arch/arm/cpu/armv7/{mx5 => imx-common}/timer.c | 17 +-
> arch/arm/cpu/armv7/mx5/Makefile | 2 +-
> arch/arm/cpu/armv7/mx5/soc.c | 77 -
> arch/arm/cpu/armv7/mx6/lowlevel_init.S | 24 +
> arch/arm/cpu/armv7/mx6/soc.c | 82 +
> arch/arm/include/asm/arch-mx28/sys_proto.h | 6 +
> arch/arm/include/asm/arch-mx6/ccm_regs.h | 892 +++++++++++
> arch/arm/include/asm/arch-mx6/clock.h | 50 +
> arch/arm/include/asm/arch-mx6/gpio.h | 35 +
> arch/arm/include/asm/arch-mx6/imx-regs.h | 236 +++
> arch/arm/include/asm/arch-mx6/iomux-v3.h | 103 ++
> arch/arm/include/asm/arch-mx6/mx6x_pins.h | 1683
> ++++++++++++++++++++
> arch/arm/include/asm/arch-mx6/sys_proto.h | 38 +
> board/denx/m28evk/Makefile | 11 +-
> board/denx/m28evk/m28evk.c | 2 +-
> board/denx/m28evk/{mmc_boot.c => spl_boot.c} | 61 +-
> board/freescale/mx6qarm2/Makefile | 42 +
> board/freescale/mx6qarm2/imximage.cfg | 167 ++
> board/freescale/mx6qarm2/mx6qarm2.c | 155 ++
> boards.cfg | 1 +
> doc/README.m28 | 3 +-
> drivers/gpio/mxc_gpio.c | 4 +-
> include/configs/m28evk.h | 6 +-
> include/configs/mx6qarm2.h | 162 ++
> 39 files changed, 4441 insertions(+), 167 deletions(-)
> rename board/denx/m28evk/m28_init.h =>
> arch/arm/cpu/arm926ejs/mx28/mx28_init.h (100%)
> create mode 100644 arch/arm/cpu/arm926ejs/mx28/spl_boot.c
> rename board/denx/m28evk/mem_init.c =>
> arch/arm/cpu/arm926ejs/mx28/spl_mem_init.c (99%)
> rename board/denx/m28evk/power_init.c =>
> arch/arm/cpu/arm926ejs/mx28/spl_power_init.c (99%)
> rename {board/denx/m28evk => arch/arm/cpu/arm926ejs/mx28}/start.S (100%)
> rename {board/denx/m28evk =>
> arch/arm/cpu/arm926ejs/mx28}/u-boot-spl.lds (93%)
> create mode 100644 arch/arm/cpu/armv7/imx-common/Makefile
> create mode 100644 arch/arm/cpu/armv7/imx-common/cpu.c
> rename arch/arm/cpu/armv7/{mx5 => imx-common}/speed.c (100%)
> rename arch/arm/cpu/armv7/{mx5 => imx-common}/timer.c (84%)
> mode change 100644 => 100755
> create mode 100644 arch/arm/cpu/armv7/mx6/Makefile
> create mode 100644 arch/arm/cpu/armv7/mx6/clock.c
> create mode 100644 arch/arm/cpu/armv7/mx6/iomux-v3.c
> create mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S
> create mode 100644 arch/arm/cpu/armv7/mx6/soc.c
> create mode 100644 arch/arm/include/asm/arch-mx6/ccm_regs.h
> create mode 100644 arch/arm/include/asm/arch-mx6/clock.h
> create mode 100644 arch/arm/include/asm/arch-mx6/gpio.h
> create mode 100644 arch/arm/include/asm/arch-mx6/imx-regs.h
> create mode 100644 arch/arm/include/asm/arch-mx6/iomux-v3.h
> create mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h
> create mode 100644 arch/arm/include/asm/arch-mx6/sys_proto.h
> rename board/denx/m28evk/{mmc_boot.c => spl_boot.c} (87%)
> create mode 100644 board/freescale/mx6qarm2/Makefile
> create mode 100644 board/freescale/mx6qarm2/imximage.cfg
> create mode 100644 board/freescale/mx6qarm2/mx6qarm2.c
> create mode 100644 include/configs/mx6qarm2.h
>
> Best regards,
> Stefano

Applied to u-boot-arm/master, thanks.

Amicalement,
--
Albert.