mbox

[U-Boot] UPDATED: pull request: u-boot-arm/master

Message ID 20130712141220.2625ee62@lilith
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

git://git.denx.de/u-boot-arm master

Message

Albert ARIBAUD July 12, 2013, 12:12 p.m. UTC
Hello Tom,

Update to my previous PR, to include the last Tegra and IMX PRs:

The following changes since commit
fbf87b1823dd5ebc2a384711ea2c677543019ece:

  arm: optimize relocate_code routine (2013-06-21 23:05:50 +0200)

are available in the git repository at:

  git://git.denx.de/u-boot-arm master

for you to fetch changes up to efc284e32503b240dbd35c6e8b8d098d702b4be7:

  Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-07-12
  13:20:35 +0200)

----------------------------------------------------------------

Ajay Kumar (1):
      video: exynos_fb: Add the missing #else clause

Albert ARIBAUD (3):
      Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
      Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
      Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Amar (2):
      EXYNOS5: I2C: Add FDT and non-FDT support for I2C
      EXYNOS: Resolve the i2c compilation error

Axel Lin (3):
      gpio: s3c2440_gpio: Fix wrong writel arguments
      gpio: s5p_gpio: Call s5p_gpio_set_value() instead of open-code
      ARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on
OMAP5

Bernie Thompson (1):
      exynos: Adjust the starting MIF voltage to 1.05v

Dirk Behme (2):
      spi: mxc_spi: Fix pre and post divider calculation
      spi: mxc_spi: Update pre and post divider algorithm

Eric Nelson (1):
      dwc_ahsata: Allow use with dcache enabled

Fabio Estevam (8):
      README: mx28_common: Keep the text within 80 columns
      README: mx28_common: Do not hardcode the SSP port
      README: mx28_common: Fix structure of sentence
      README: mxs: Introduce README.mxs
      mx28evk: Move README file inside board directory
      m28evk: Move README file inside board directory
      MAINTAINERS: Add an entry to the mx6q wandboard variant
      video: mxsfb: Break the line in videomode message

Ilya Ledvich (1):
      am33xx: fix the ddr_cmdtctrl structure

Jim Lin (3):
      ARM: Tegra: FDT: Add USB EHCI function for T30/T114
      ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114
      Tegra: Config: Enable Tegra30/Tegra114 USB function

Lokesh Vutla (1):
      ARM: OMAP4+: Fix MA detection during SDRAM_AUTO_DETECTION

Marek Vasut (3):
      m28evk: add trimffs to nand command
      net: fec: Remove bogus flush_dcache_range() call
      net: fec: Avoid MX28 bus sync issue

Michael Trimarchi (1):
      usb: omap: ulpi: fix ulpi transceiver access

Mike Dunn (5):
      pxa: add support for palmtreo680 board
      pxa: palmtreo680 flash programming utility
      pxa: turn icache off in cpu_init_crit()
      pxa: use -mcpu=xscale compiler option
      pxa: fix memory coherency problem after relocation

Minkyu Kang (1):
      arm: exynos: fix clock calculation

Otavio Salvador (8):
      vf610twr: Add default environment in line with other Freescale
boards vf610twr: Remove SoC name from U-Boot prompt
      mx53loco: Change default environment to cope with OE changes
      mx6qsabrelite: Change default environment to cope with OE changes
      mx6slevk: Change default environment to cope with OE changes
      wandboard: Change default environment to cope with OE changes
      mx51evk: Change default environment to cope with OE changes
      mx53ard: Change default environment to cope with OE changes

Pierre Aubert (3):
      imx6: fix GPR2 wrong definition
      imx: Complete the pin definitions for the i.MX6DL / i.MX6Solo
      imx: Add support for the SabreSD shipped with i.MX6DL

Rajeshwari Shinde (9):
      EXYNOS5: FDT: Add compatible strings for Serial
      EXYNOS5: FDT: Add serial device node values
      S5P: Serial: Add fdt support to driver
      CONFIG: EXYNOS5: Enable silent console
      SMDK5250: Remove reduntant code
      EXYNOS: Add API for power reset and exit wakeup
      EXYNOS: LDS file move to common
      EXYNOS4210: Configure GPIO for uart
      EXYNOS: Move files from board/samsung to arch/arm

Robert Winkler (4):
      imx: nitrogen6x: Enabled data cache
      imx: nitrogen6x: Enable bootz
      imx: nitrogen6x: Enable raw initrd
      imx: nitrogen6x: Enable filesystem generic commands

Simon Glass (1):
      exynos: Enable mmc for snow

Stephen Warren (2):
      ARM: tegra: enable LCD panel on Harmony
      ARM: tegra: enable LCD panel on Ventana

Tapani Utriainen (1):
      Add support for Wandboard Quad

trem (2):
      mx27: add function enable_caches
      mx27: add i2c clock

Ɓukasz Majewski (2):
      arm:trats: Increase malloc pool size (for DFU ext4 transfers)
      power:bat:trats: Break battery charging with ctrl+C

 CREDITS                                            |    4 +
 MAINTAINERS                                        |    7 +-
 arch/arm/cpu/arm926ejs/mx27/generic.c              |   10 +
 arch/arm/cpu/armv7/exynos/Makefile                 |   17 +-
 arch/arm/cpu/armv7/exynos/clock.c                  |   43 +-
 .../arm/cpu/armv7/exynos}/clock_init.h             |    0
 arch/arm/cpu/armv7/exynos/clock_init_exynos4.c     |   95 ++
 .../arm/cpu/armv7/exynos/clock_init_exynos5.c      |   56 +-
 arch/arm/cpu/armv7/exynos/common_setup.h           |   45 +
 .../arm/cpu/armv7/exynos}/dmc_common.c             |    7 +-
 .../arm/cpu/armv7/exynos}/dmc_init_ddr3.c          |   27 +-
 arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c       |  213 +++
 .../arm/cpu/armv7/exynos/exynos4_setup.h           |  397 +++--
 .../arm/cpu/armv7/exynos/exynos5_setup.h           |   28 +-
 arch/arm/cpu/armv7/exynos/lowlevel_init.c          |   73 +
 arch/arm/cpu/armv7/exynos/pinmux.c                 |   40 +
 arch/arm/cpu/armv7/exynos/power.c                  |   50 +
 .../arm/cpu/armv7/exynos}/spl_boot.c               |   84 +-
 arch/arm/cpu/armv7/omap-common/emif-common.c       |    3 +
 arch/arm/cpu/armv7/omap5/hw_data.c                 |    2 +
 arch/arm/cpu/armv7/omap5/hwinit.c                  |    4 +-
 arch/arm/cpu/pxa/config.mk                         |    2 +-
 arch/arm/cpu/pxa/start.S                           |    3 +-
 arch/arm/dts/exynos5250.dtsi                       |   27 +
 arch/arm/dts/tegra114.dtsi                         |   27 +
 arch/arm/dts/tegra30.dtsi                          |   27 +
 arch/arm/include/asm/arch-am33xx/ddr_defs.h        |    1 -
 arch/arm/include/asm/arch-am33xx/gpio.h            |    2 +
 arch/arm/include/asm/arch-exynos/cpu.h             |   13 +-
 arch/arm/include/asm/arch-exynos/power.h           |   12 +
 arch/arm/include/asm/arch-exynos/spl.h             |    1 +
 arch/arm/include/asm/arch-mx27/clock.h             |    1 +
 arch/arm/include/asm/arch-mx6/imx-regs.h           |    2 +-
 arch/arm/include/asm/arch-mx6/mx6dl_pins.h         | 1591
 +++++++++++++++++++-
 arch/arm/include/asm/arch-omap3/gpio.h             |    2 +
 arch/arm/include/asm/arch-omap4/gpio.h             |    2 +
 arch/arm/include/asm/arch-omap5/gpio.h             |    4 +
 arch/arm/include/asm/arch-tegra/clk_rst.h          |   10 +
 arch/arm/include/asm/arch-tegra/usb.h              |  182 +--
 arch/arm/include/asm/arch-tegra114/usb.h           |  156 ++
 arch/arm/include/asm/arch-tegra20/usb.h            |  155 ++
 arch/arm/include/asm/arch-tegra30/usb.h            |  168 +++
 arch/arm/lib/relocate.S                            |    9 +
 doc/README.m28 => board/denx/m28evk/README         |    4
 +- .../freescale/mx28evk/README                       |    3
 +- .../freescale/{mx6qsabresd => mx6sabresd}/Makefile |    2
 +- .../mx6qsabresd.c => mx6sabresd/mx6sabresd.c}      |    7 +-
 board/nvidia/common/board.c                        |    1 +
 board/nvidia/dts/tegra114-dalmore.dts              |    7 +
 board/nvidia/dts/tegra20-harmony.dts               |   32 +
 board/nvidia/dts/tegra20-ventana.dts               |   32 +
 board/nvidia/dts/tegra30-beaver.dts                |    6 +
 board/nvidia/dts/tegra30-cardhu.dts                |    6 +
 board/nvidia/harmony/harmony.c                     |    7 +
 board/palmtreo680/Makefile                         |   34 +
 board/palmtreo680/README                           |  581 +++++++
 board/palmtreo680/palmtreo680.c                    |  148
 ++ .../exynos-uboot-spl.lds}                          |    0
 board/samsung/dts/exynos5250-smdk5250.dts          |    2 +
 board/samsung/dts/exynos5250-snow.dts              |   26 +
 board/samsung/origen/Makefile                      |   11 +-
 board/samsung/origen/lowlevel_init.S               |  357 -----
 board/samsung/origen/mem_setup.S                   |  421 ------
 board/samsung/origen/mmc_boot.c                    |   58 -
 board/samsung/origen/origen.c                      |   46 +
 board/samsung/smdk5250/Makefile                    |   14 +-
 board/samsung/smdk5250/smdk5250.c                  |   12 +-
 board/samsung/smdkv310/Makefile                    |   10 +-
 board/samsung/smdkv310/lowlevel_init.S             |  414 -----
 board/samsung/smdkv310/mem_setup.S                 |  365 -----
 board/samsung/smdkv310/mmc_boot.c                  |   60 -
 board/samsung/smdkv310/smdkv310.c                  |   46 +
 board/wandboard/README                             |    5 +
 board/wandboard/wandboard.c                        |    2 +-
 boards.cfg                                         |    7 +-
 doc/README.mx28_common                             |   75 +-
 drivers/block/dwc_ahsata.c                         |   34 +-
 drivers/gpio/omap_gpio.c                           |    2 +-
 drivers/gpio/s3c2440_gpio.c                        |    6 +-
 drivers/gpio/s5p_gpio.c                            |    9 +-
 drivers/i2c/s3c24x0_i2c.c                          |    3 +-
 drivers/net/fec_mxc.c                              |   23 +-
 drivers/power/battery/bat_trats.c                  |   13 +-
 drivers/power/power_core.c                         |    3 +-
 drivers/serial/serial_s5p.c                        |   78 +
 drivers/spi/mxc_spi.c                              |   28 +-
 drivers/usb/host/ehci-tegra.c                      |  304 +++-
 drivers/usb/ulpi/omap-ulpi-viewport.c              |   42 +-
 drivers/video/exynos_fimd.c                        |    3 +-
 drivers/video/mxsfb.c                              |    2 +-
 include/configs/beaver.h                           |   14 +
 include/configs/cardhu.h                           |   14 +
 include/configs/dalmore.h                          |   14 +
 include/configs/exynos5250-dt.h                    |   12 +-
 include/configs/harmony.h                          |    9 +
 include/configs/m28evk.h                           |    1 +
 include/configs/mx51evk.h                          |    4 +-
 include/configs/mx53ard.h                          |    4 +-
 include/configs/mx53loco.h                         |    4 +-
 include/configs/mx6qsabreauto.h                    |    2 +-
 include/configs/mx6qsabrelite.h                    |    4
 +- .../{mx6qsabre_common.h => mx6sabre_common.h}      |    1 -
 include/configs/{mx6qsabresd.h => mx6sabresd.h}    |    2 +-
 include/configs/mx6slevk.h                         |    4 +-
 include/configs/nitrogen6x.h                       |    6 +-
 include/configs/origen.h                           |    9 +-
 include/configs/palmtreo680.h                      |  286 ++++
 include/configs/smdkv310.h                         |    8 +-
 include/configs/tegra114-common.h                  |    3 +
 include/configs/tegra30-common.h                   |    3 +
 include/configs/trats.h                            |    2 +-
 include/configs/ventana.h                          |    9 +
 include/configs/vf610twr.h                         |   93 +-
 include/configs/wandboard.h                        |    6 +-
 include/fdtdec.h                                   |    3 +
 include/power/max77686_pmic.h                      |    2 +
 lib/fdtdec.c                                       |    3 +
 tools/palmtreo680/flash_u-boot.c                   |  177 +++ 118
 files changed, 5293 insertions(+), 2359 deletions(-) rename
 {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/clock_init.h
 (100%) create mode 100644
 arch/arm/cpu/armv7/exynos/clock_init_exynos4.c rename
 board/samsung/smdk5250/clock_init.c =>
 arch/arm/cpu/armv7/exynos/clock_init_exynos5.c (94%) create mode
 100644 arch/arm/cpu/armv7/exynos/common_setup.h rename
 {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/dmc_common.c
 (97%) rename {board/samsung/smdk5250 =>
 arch/arm/cpu/armv7/exynos}/dmc_init_ddr3.c (92%) create mode 100644
 arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c rename
 board/samsung/origen/origen_setup.h =>
 arch/arm/cpu/armv7/exynos/exynos4_setup.h (65%) rename
 board/samsung/smdk5250/setup.h =>
 arch/arm/cpu/armv7/exynos/exynos5_setup.h (96%) create mode 100644
 arch/arm/cpu/armv7/exynos/lowlevel_init.c rename
 {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/spl_boot.c (73%)
 create mode 100644 arch/arm/include/asm/arch-tegra114/usb.h create
 mode 100644 arch/arm/include/asm/arch-tegra20/usb.h create mode 100644
 arch/arm/include/asm/arch-tegra30/usb.h rename doc/README.m28 =>
 board/denx/m28evk/README (75%) rename doc/README.mx28evk =>
 board/freescale/mx28evk/README (93%) rename
 board/freescale/{mx6qsabresd => mx6sabresd}/Makefile (98%) rename
 board/freescale/{mx6qsabresd/mx6qsabresd.c => mx6sabresd/mx6sabresd.c}
 (98%) create mode 100644 board/palmtreo680/Makefile create mode 100644
 board/palmtreo680/README create mode 100644
 board/palmtreo680/palmtreo680.c rename
 board/samsung/{smdk5250/smdk5250-uboot-spl.lds =>
 common/exynos-uboot-spl.lds} (100%) delete mode 100644
 board/samsung/origen/lowlevel_init.S delete mode 100644
 board/samsung/origen/mem_setup.S delete mode 100644
 board/samsung/origen/mmc_boot.c delete mode 100644
 board/samsung/smdkv310/lowlevel_init.S delete mode 100644
 board/samsung/smdkv310/mem_setup.S delete mode 100644
 board/samsung/smdkv310/mmc_boot.c rename
 include/configs/{mx6qsabre_common.h => mx6sabre_common.h} (99%) rename
 include/configs/{mx6qsabresd.h => mx6sabresd.h} (97%) create mode
 100644 include/configs/palmtreo680.h create mode 100644
 tools/palmtreo680/flash_u-boot.c

Amicalement,

Comments

Tom Rini July 12, 2013, 9:24 p.m. UTC | #1
On Fri, Jul 12, 2013 at 02:12:20PM +0200, Albert ARIBAUD wrote:

> Hello Tom,
> 
> Update to my previous PR, to include the last Tegra and IMX PRs:
> 
> The following changes since commit
> fbf87b1823dd5ebc2a384711ea2c677543019ece:
> 
>   arm: optimize relocate_code routine (2013-06-21 23:05:50 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-arm master
> 
> for you to fetch changes up to efc284e32503b240dbd35c6e8b8d098d702b4be7:
> 
>   Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-07-12
>   13:20:35 +0200)
> 
> ----------------------------------------------------------------
> 
> Ajay Kumar (1):
>       video: exynos_fb: Add the missing #else clause
> 
> Albert ARIBAUD (3):
>       Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
>       Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
>       Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
> 
> Amar (2):
>       EXYNOS5: I2C: Add FDT and non-FDT support for I2C
>       EXYNOS: Resolve the i2c compilation error
> 
> Axel Lin (3):
>       gpio: s3c2440_gpio: Fix wrong writel arguments
>       gpio: s5p_gpio: Call s5p_gpio_set_value() instead of open-code
>       ARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on
> OMAP5
> 
> Bernie Thompson (1):
>       exynos: Adjust the starting MIF voltage to 1.05v
> 
> Dirk Behme (2):
>       spi: mxc_spi: Fix pre and post divider calculation
>       spi: mxc_spi: Update pre and post divider algorithm
> 
> Eric Nelson (1):
>       dwc_ahsata: Allow use with dcache enabled
> 
> Fabio Estevam (8):
>       README: mx28_common: Keep the text within 80 columns
>       README: mx28_common: Do not hardcode the SSP port
>       README: mx28_common: Fix structure of sentence
>       README: mxs: Introduce README.mxs
>       mx28evk: Move README file inside board directory
>       m28evk: Move README file inside board directory
>       MAINTAINERS: Add an entry to the mx6q wandboard variant
>       video: mxsfb: Break the line in videomode message
> 
> Ilya Ledvich (1):
>       am33xx: fix the ddr_cmdtctrl structure
> 
> Jim Lin (3):
>       ARM: Tegra: FDT: Add USB EHCI function for T30/T114
>       ARM: Tegra: USB: EHCI: Add support for Tegra30/Tegra114
>       Tegra: Config: Enable Tegra30/Tegra114 USB function
> 
> Lokesh Vutla (1):
>       ARM: OMAP4+: Fix MA detection during SDRAM_AUTO_DETECTION
> 
> Marek Vasut (3):
>       m28evk: add trimffs to nand command
>       net: fec: Remove bogus flush_dcache_range() call
>       net: fec: Avoid MX28 bus sync issue
> 
> Michael Trimarchi (1):
>       usb: omap: ulpi: fix ulpi transceiver access
> 
> Mike Dunn (5):
>       pxa: add support for palmtreo680 board
>       pxa: palmtreo680 flash programming utility
>       pxa: turn icache off in cpu_init_crit()
>       pxa: use -mcpu=xscale compiler option
>       pxa: fix memory coherency problem after relocation
> 
> Minkyu Kang (1):
>       arm: exynos: fix clock calculation
> 
> Otavio Salvador (8):
>       vf610twr: Add default environment in line with other Freescale
> boards vf610twr: Remove SoC name from U-Boot prompt
>       mx53loco: Change default environment to cope with OE changes
>       mx6qsabrelite: Change default environment to cope with OE changes
>       mx6slevk: Change default environment to cope with OE changes
>       wandboard: Change default environment to cope with OE changes
>       mx51evk: Change default environment to cope with OE changes
>       mx53ard: Change default environment to cope with OE changes
> 
> Pierre Aubert (3):
>       imx6: fix GPR2 wrong definition
>       imx: Complete the pin definitions for the i.MX6DL / i.MX6Solo
>       imx: Add support for the SabreSD shipped with i.MX6DL
> 
> Rajeshwari Shinde (9):
>       EXYNOS5: FDT: Add compatible strings for Serial
>       EXYNOS5: FDT: Add serial device node values
>       S5P: Serial: Add fdt support to driver
>       CONFIG: EXYNOS5: Enable silent console
>       SMDK5250: Remove reduntant code
>       EXYNOS: Add API for power reset and exit wakeup
>       EXYNOS: LDS file move to common
>       EXYNOS4210: Configure GPIO for uart
>       EXYNOS: Move files from board/samsung to arch/arm
> 
> Robert Winkler (4):
>       imx: nitrogen6x: Enabled data cache
>       imx: nitrogen6x: Enable bootz
>       imx: nitrogen6x: Enable raw initrd
>       imx: nitrogen6x: Enable filesystem generic commands
> 
> Simon Glass (1):
>       exynos: Enable mmc for snow
> 
> Stephen Warren (2):
>       ARM: tegra: enable LCD panel on Harmony
>       ARM: tegra: enable LCD panel on Ventana
> 
> Tapani Utriainen (1):
>       Add support for Wandboard Quad
> 
> trem (2):
>       mx27: add function enable_caches
>       mx27: add i2c clock
> 
> ??ukasz Majewski (2):
>       arm:trats: Increase malloc pool size (for DFU ext4 transfers)
>       power:bat:trats: Break battery charging with ctrl+C

Applied to u-boot/master, thanks!