Skip to contentSkip to conversation

Pull request: u-boot-arm/master

U-Boot Applied Albert ARIBAUD 2 participants 2 messages Dec 9, 2011 – Dec 10, 2011

lore
Share & tools
lore
#0 lore raw

Hi Wolfgang,

The following changes since commit c4eba6ec5c58083b38340724c006294c7a4fe2eb:

common/usb_kbd.c: fix bug introduced in commit 00b7d6e (2011-12-09
12:09:35 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Chander Kashyap (1):
S5PC2XX: Rename S5pc2XX to exynos

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

Simon Glass (9):
tegra2: Add arch_cpu_init() to fire up Cortex-A9
tegra2: Simplify tegra_start() boot path
arm: Move CP15 init out of cpu_init_crit()
tegra2: Enable instruction cache
tegra2: Remove unneeded boot code
tegra2: Remove unneeded config option
tegra2: Remove unused low-level Tegra2 UART code
tegra2: Remove unneeded 'dynamic ram size' message
tegra2: Don't use board pointer before it is set up

Stephen Warren (4):
tegra2: Move board_mmc_init into board files
tegra2: Modify MMC driver to handle power and cd GPIOs
tegra2: Add support for Ventana
tegra2: Use new GPIO APIs in gpio_config_uart()

  MAINTAINERS                                        |   12 +-
  Makefile                                           |   10 +-
  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/{s5pc2xx => exynos}/Makefile    |    0
  arch/arm/cpu/armv7/{s5pc2xx => exynos}/clock.c     |   50 +-
  arch/arm/cpu/armv7/{s5pc2xx => exynos}/soc.c       |    0
  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/Makefile                    |   48 +
  arch/arm/cpu/armv7/mx6/clock.c                     |  366 +++++
  arch/arm/cpu/armv7/mx6/iomux-v3.c                  |   71 +
  arch/arm/cpu/armv7/mx6/lowlevel_init.S             |   24 +
  arch/arm/cpu/armv7/mx6/soc.c                       |   82 +
  arch/arm/cpu/armv7/start.S                         |   36 +-
  arch/arm/cpu/armv7/tegra2/Makefile                 |    5 +
  arch/arm/cpu/armv7/tegra2/ap20.c                   |   54 +-
  arch/arm/cpu/armv7/tegra2/ap20.h                   |   10 +-
  arch/arm/cpu/armv7/tegra2/board.c                  |   35 +-
  arch/arm/cpu/armv7/tegra2/config.mk                |    7 +-
  arch/arm/cpu/armv7/tegra2/lowlevel_init.S          |  118 --
  .../asm/{arch-s5pc2xx => arch-exynos}/adc.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/clk.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/clock.h      |    2 +-
  .../asm/{arch-s5pc2xx => arch-exynos}/cpu.h        |   64 +-
  .../asm/{arch-s5pc2xx => arch-exynos}/gpio.h       |   28 +-
  .../asm/{arch-s5pc2xx => arch-exynos}/mmc.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/pwm.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/sromc.h      |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/sys_proto.h  |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/uart.h       |    0
  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 +
  .../arm/include/asm/arch-mx6/gpio.h                |   18 +-
  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 +
  arch/arm/include/asm/u-boot-arm.h                  |    3 +
  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 ++
  board/nvidia/common/board.c                        |   58 +-
  board/nvidia/common/board.h                        |    4 +-
  board/nvidia/harmony/harmony.c                     |   57 +-
  board/nvidia/seaboard/seaboard.c                   |   81 +-
  board/nvidia/ventana/Makefile                      |   49 +
  board/samsung/origen/lowlevel_init.S               |   26 +-
  board/samsung/origen/mem_setup.S                   |   12 +-
  board/samsung/origen/origen.c                      |    8 +-
  board/samsung/origen/origen_setup.h                |    8 +-
  board/samsung/smdkv310/lowlevel_init.S             |   22 +-
  board/samsung/smdkv310/mem_setup.S                 |    8 +-
  board/samsung/smdkv310/smdkv310.c                  |    8 +-
  board/samsung/universal_c210/lowlevel_init.S       |   24 +-
  board/samsung/universal_c210/universal.c           |    8 +-
  boards.cfg                                         |    8 +-
  doc/README.m28                                     |    3 +-
  drivers/gpio/mxc_gpio.c                            |    4 +-
  drivers/gpio/tegra2_gpio.c                         |    6 +-
  drivers/mmc/tegra2_mmc.c                           |   42 +-
  drivers/mmc/tegra2_mmc.h                           |    4 +-
  drivers/serial/Makefile                            |    1 -
  drivers/serial/serial_tegra2.c                     |   77 -
  include/configs/m28evk.h                           |    6 +-
  include/configs/mx6qarm2.h                         |  162 ++
  include/configs/origen.h                           |    6 +-
  include/configs/s5pc210_universal.h                |   10 +-
  include/configs/smdkv310.h                         |    6 +-
  include/configs/tegra2-common.h                    |    3 +-
  include/configs/ventana.h                          |   55 +
  84 files changed, 4903 insertions(+), 703 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%)
rename arch/arm/cpu/armv7/{s5pc2xx => exynos}/Makefile (100%) rename arch/arm/cpu/armv7/{s5pc2xx => exynos}/clock.c (81%) rename arch/arm/cpu/armv7/{s5pc2xx => exynos}/soc.c (100%) 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
rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/adc.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/clk.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/clock.h (99%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/cpu.h (64%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/gpio.h (84%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/mmc.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/pwm.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/sromc.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/sys_proto.h
(100%)
rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/uart.h (100%) create mode 100644 arch/arm/include/asm/arch-mx6/ccm_regs.h create mode 100644 arch/arm/include/asm/arch-mx6/clock.h rename drivers/serial/serial_tegra2.h =>
arch/arm/include/asm/arch-mx6/gpio.h (75%)
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 board/nvidia/ventana/Makefile
delete mode 100644 drivers/serial/serial_tegra2.c
create mode 100644 include/configs/mx6qarm2.h
create mode 100644 include/configs/ventana.h

Amicalement,

Signature · 1 line
Albert.
#1 lore raw

Dear Albert ARIBAUD,

Quoted 170 lines · In message <[email protected]> you wrote:

Hi Wolfgang,

The following changes since commit c4eba6ec5c58083b38340724c006294c7a4fe2eb:

common/usb_kbd.c: fix bug introduced in commit 00b7d6e (2011-12-09
12:09:35 +0100)

are available in the git repository at:
git://git.denx.de/u-boot-arm.git master

Chander Kashyap (1):
S5PC2XX: Rename S5pc2XX to exynos

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

Simon Glass (9):
tegra2: Add arch_cpu_init() to fire up Cortex-A9
tegra2: Simplify tegra_start() boot path
arm: Move CP15 init out of cpu_init_crit()
tegra2: Enable instruction cache
tegra2: Remove unneeded boot code
tegra2: Remove unneeded config option
tegra2: Remove unused low-level Tegra2 UART code
tegra2: Remove unneeded 'dynamic ram size' message
tegra2: Don't use board pointer before it is set up

Stephen Warren (4):
tegra2: Move board_mmc_init into board files
tegra2: Modify MMC driver to handle power and cd GPIOs
tegra2: Add support for Ventana
tegra2: Use new GPIO APIs in gpio_config_uart()

  MAINTAINERS                                        |   12 +-
  Makefile                                           |   10 +-
  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/{s5pc2xx => exynos}/Makefile    |    0
  arch/arm/cpu/armv7/{s5pc2xx => exynos}/clock.c     |   50 +-
  arch/arm/cpu/armv7/{s5pc2xx => exynos}/soc.c       |    0
  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/Makefile                    |   48 +
  arch/arm/cpu/armv7/mx6/clock.c                     |  366 +++++
  arch/arm/cpu/armv7/mx6/iomux-v3.c                  |   71 +
  arch/arm/cpu/armv7/mx6/lowlevel_init.S             |   24 +
  arch/arm/cpu/armv7/mx6/soc.c                       |   82 +
  arch/arm/cpu/armv7/start.S                         |   36 +-
  arch/arm/cpu/armv7/tegra2/Makefile                 |    5 +
  arch/arm/cpu/armv7/tegra2/ap20.c                   |   54 +-
  arch/arm/cpu/armv7/tegra2/ap20.h                   |   10 +-
  arch/arm/cpu/armv7/tegra2/board.c                  |   35 +-
  arch/arm/cpu/armv7/tegra2/config.mk                |    7 +-
  arch/arm/cpu/armv7/tegra2/lowlevel_init.S          |  118 --
  .../asm/{arch-s5pc2xx => arch-exynos}/adc.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/clk.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/clock.h      |    2 +-
  .../asm/{arch-s5pc2xx => arch-exynos}/cpu.h        |   64 +-
  .../asm/{arch-s5pc2xx => arch-exynos}/gpio.h       |   28 +-
  .../asm/{arch-s5pc2xx => arch-exynos}/mmc.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/pwm.h        |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/sromc.h      |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/sys_proto.h  |    0
  .../asm/{arch-s5pc2xx => arch-exynos}/uart.h       |    0
  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 +
  .../arm/include/asm/arch-mx6/gpio.h                |   18 +-
  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 +
  arch/arm/include/asm/u-boot-arm.h                  |    3 +
  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 ++
  board/nvidia/common/board.c                        |   58 +-
  board/nvidia/common/board.h                        |    4 +-
  board/nvidia/harmony/harmony.c                     |   57 +-
  board/nvidia/seaboard/seaboard.c                   |   81 +-
  board/nvidia/ventana/Makefile                      |   49 +
  board/samsung/origen/lowlevel_init.S               |   26 +-
  board/samsung/origen/mem_setup.S                   |   12 +-
  board/samsung/origen/origen.c                      |    8 +-
  board/samsung/origen/origen_setup.h                |    8 +-
  board/samsung/smdkv310/lowlevel_init.S             |   22 +-
  board/samsung/smdkv310/mem_setup.S                 |    8 +-
  board/samsung/smdkv310/smdkv310.c                  |    8 +-
  board/samsung/universal_c210/lowlevel_init.S       |   24 +-
  board/samsung/universal_c210/universal.c           |    8 +-
  boards.cfg                                         |    8 +-
  doc/README.m28                                     |    3 +-
  drivers/gpio/mxc_gpio.c                            |    4 +-
  drivers/gpio/tegra2_gpio.c                         |    6 +-
  drivers/mmc/tegra2_mmc.c                           |   42 +-
  drivers/mmc/tegra2_mmc.h                           |    4 +-
  drivers/serial/Makefile                            |    1 -
  drivers/serial/serial_tegra2.c                     |   77 -
  include/configs/m28evk.h                           |    6 +-
  include/configs/mx6qarm2.h                         |  162 ++
  include/configs/origen.h                           |    6 +-
  include/configs/s5pc210_universal.h                |   10 +-
  include/configs/smdkv310.h                         |    6 +-
  include/configs/tegra2-common.h                    |    3 +-
  include/configs/ventana.h                          |   55 +
  84 files changed, 4903 insertions(+), 703 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%)
rename arch/arm/cpu/armv7/{s5pc2xx => exynos}/Makefile (100%) rename arch/arm/cpu/armv7/{s5pc2xx => exynos}/clock.c (81%) rename arch/arm/cpu/armv7/{s5pc2xx => exynos}/soc.c (100%) 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
rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/adc.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/clk.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/clock.h (99%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/cpu.h (64%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/gpio.h (84%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/mmc.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/pwm.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/sromc.h (100%) rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/sys_proto.h
(100%)
rename arch/arm/include/asm/{arch-s5pc2xx => arch-exynos}/uart.h (100%) create mode 100644 arch/arm/include/asm/arch-mx6/ccm_regs.h create mode 100644 arch/arm/include/asm/arch-mx6/clock.h rename drivers/serial/serial_tegra2.h =>
arch/arm/include/asm/arch-mx6/gpio.h (75%)
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

Quoted 8 lines

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 board/nvidia/ventana/Makefile delete mode 100644 drivers/serial/serial_tegra2.c create mode 100644 include/configs/mx6qarm2.h create mode 100644 include/configs/ventana.h

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
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
"We learn from history that we learn nothing from history."
- George Bernard Shaw