mbox

[U-Boot] Please pull u-boot-ti/master

Message ID 20140726012915.GZ1847@bill-the-cat
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Pull-request

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

Message

Tom Rini July 26, 2014, 1:29 a.m. UTC
Hey,

The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:

  socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)

are available in the git repository at:

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

for you to fetch changes up to 434f2cfcad9f70231ad5a096325ba72ef0d2a2cc:

  ARM: omap: move board specific NAND configs out from ti_armv7_common.h (2014-07-25 16:26:12 -0400)

----------------------------------------------------------------
Andreas Bießmann (1):
      tricorder: convert to generic board

Hao Zhang (10):
      keystone2: ddr: add DDR3 PHY configs updated for PG 2.0
      keystone2: move cpu_to_bus() to keystone.c
      keystone2: add possibility to turn off all dsps
      ARM: keystone2: move K2HK board files to common KS2 board directory
      configs: k2hk_evm: config: add common EVM configuration header
      keystone: ddr3: move K2HK DDR3 configuration to a common file
      ARM: keystone2: add K2E SoC hardware definitions
      ARM: keystone2: clock: add K2E clock support
      ARM: keystone2: add MSMC cache coherency support for K2E SOC
      board: k2e-evm: add board support

Khoronzhuk, Ivan (10):
      mtd: nand: davinci: add opportunity to write keystone U-boot image
      keystone: add support for NAND gpheader image
      k2hk_evm: add script to automate NAND flash process
      ARM: keystone2: psc: use common PSC base
      keystone: ddr3: add ddr3.h to hold ddr3 API
      ARM: keystone2: keystone_nav: make it dependent on keystone driver
      k2hk: use common KS2_ prefix for all hardware definitions
      ARM: keystone: clock: move K2HK SoC dependent code in separate file
      keystone2: use CONFIG_SOC_KEYSTONE in common places
      ARM: keystone2: spl: add K2E SoC support

Mugunthan V N (3):
      drivers: net: cpsw: add support for using second port as ethernet
      ARM: DRA7xx: Add cpsw second port pinmux
      ARM: dra7_evm: Add Ethernet support for dra72x platform

Murali Karicheri (1):
      keystone2: add env option to do unitrd dt fixup

Rajendra Nayak (1):
      ARM: OMAP: Fix handling of errata i727

Stefan Roese (3):
      ARM: omap: Fix GPMC init for OMAP3 platforms
      ARM: omap: Remove unused arch/arm/cpu/armv7/omap3/mem.c
      ARM: omap: tao3530: Convert to generic board

Tom Rini (3):
      power/pmic.h: Add prototype for power_init_board.
      tps65218/am43xx_evm: Add power framework support to TPS65218
      am335x_evm / gumstix pepper: Correct DDR settings

pekon gupta (3):
      ARM: omap: fix GPMC address-map size for NAND and NOR devices
      ARM: omap: clean redundant PISMO_xx macros used in OMAP3
      ARM: omap: move board specific NAND configs out from ti_armv7_common.h

 Makefile                                           |    6 +
 arch/arm/cpu/armv7/keystone/Makefile               |    5 +-
 arch/arm/cpu/armv7/keystone/clock-k2e.c            |  101 +++++++
 arch/arm/cpu/armv7/keystone/clock-k2hk.c           |  113 ++++++++
 arch/arm/cpu/armv7/keystone/clock.c                |  154 ++---------
 arch/arm/cpu/armv7/keystone/cmd_clock.c            |   31 ++-
 arch/arm/cpu/armv7/keystone/ddr3.c                 |   25 +-
 arch/arm/cpu/armv7/keystone/init.c                 |   16 +-
 arch/arm/cpu/armv7/keystone/keystone.c             |   87 +++++++
 arch/arm/cpu/armv7/keystone/msmc.c                 |    6 +-
 arch/arm/cpu/armv7/keystone/psc.c                  |   42 ++-
 arch/arm/cpu/armv7/keystone/spl.c                  |    8 +
 arch/arm/cpu/armv7/omap-common/hwinit-common.c     |    3 +-
 arch/arm/cpu/armv7/omap-common/mem-common.c        |   15 +-
 arch/arm/cpu/armv7/omap3/mem.c                     |  139 ----------
 arch/arm/include/asm/arch-am33xx/ddr_defs.h        |    4 -
 arch/arm/include/asm/arch-am33xx/mem.h             |    7 -
 arch/arm/include/asm/arch-keystone/clock-k2e.h     |   68 +++++
 arch/arm/include/asm/arch-keystone/clock-k2hk.h    |   23 +-
 arch/arm/include/asm/arch-keystone/clock.h         |   32 +++
 arch/arm/include/asm/arch-keystone/clock_defs.h    |    2 +-
 arch/arm/include/asm/arch-keystone/ddr3.h          |   56 ++++
 arch/arm/include/asm/arch-keystone/hardware-k2e.h  |   44 ++++
 arch/arm/include/asm/arch-keystone/hardware-k2hk.h |  182 +++++--------
 arch/arm/include/asm/arch-keystone/hardware.h      |  117 ++++++---
 arch/arm/include/asm/arch-keystone/mon.h           |   15 ++
 arch/arm/include/asm/arch-keystone/msmc.h          |   17 ++
 arch/arm/include/asm/arch-omap3/cpu.h              |    1 -
 arch/arm/include/asm/arch-omap3/mem.h              |   13 -
 arch/arm/include/asm/omap_common.h                 |    8 +
 board/gumstix/pepper/board.c                       |   30 +--
 board/ti/am335x/board.c                            |   30 +--
 board/ti/am43xx/board.c                            |   14 +
 board/ti/dra7xx/evm.c                              |    7 +-
 board/ti/dra7xx/mux_data.h                         |   12 +
 board/ti/k2hk_evm/Makefile                         |    9 -
 board/ti/k2hk_evm/ddr3.c                           |  268 -------------------
 board/ti/ks2_evm/Makefile                          |   13 +
 board/ti/{k2hk_evm/README => ks2_evm/README_K2HK}  |   28 +-
 board/ti/{k2hk_evm => ks2_evm}/board.c             |  156 +++--------
 board/ti/ks2_evm/board.h                           |   19 ++
 board/ti/ks2_evm/board_k2e.c                       |   39 +++
 board/ti/ks2_evm/board_k2hk.c                      |   81 ++++++
 board/ti/ks2_evm/ddr3_cfg.c                        |  170 ++++++++++++
 board/ti/ks2_evm/ddr3_cfg.h                        |   24 ++
 board/ti/ks2_evm/ddr3_k2e.c                        |   55 ++++
 board/ti/ks2_evm/ddr3_k2hk.c                       |   84 ++++++
 boards.cfg                                         |    3 +-
 common/image-fdt.c                                 |    2 +-
 doc/README.nand                                    |   12 +
 drivers/mtd/nand/davinci_nand.c                    |  196 ++++++++++++++
 drivers/net/cpsw.c                                 |    8 +-
 drivers/power/pmic/pmic_tps65218.c                 |   22 ++
 drivers/serial/ns16550.c                           |    4 +-
 include/configs/am335x_evm.h                       |    6 +
 include/configs/am3517_crane.h                     |    7 +-
 include/configs/am3517_evm.h                       |    7 +-
 include/configs/am43xx_evm.h                       |    2 +
 include/configs/cm_t335.h                          |    5 +
 include/configs/cm_t35.h                           |    3 -
 include/configs/devkit8000.h                       |    2 -
 include/configs/dig297.h                           |    4 -
 include/configs/k2e_evm.h                          |   37 +++
 include/configs/k2hk_evm.h                         |  253 +-----------------
 include/configs/ks2_evm.h                          |  275 ++++++++++++++++++++
 include/configs/mcx.h                              |    4 -
 include/configs/nokia_rx51.h                       |    2 -
 include/configs/omap3_beagle.h                     |   13 +-
 include/configs/omap3_evm_common.h                 |    7 +-
 include/configs/omap3_igep00x0.h                   |   10 +-
 include/configs/omap3_logic.h                      |    8 +-
 include/configs/omap3_overo.h                      |   12 +-
 include/configs/omap3_pandora.h                    |    7 +-
 include/configs/omap3_zoom1.h                      |   13 +-
 include/configs/pengwyn.h                          |    6 +
 include/configs/tam3517-common.h                   |    4 -
 include/configs/tao3530.h                          |    8 +-
 include/configs/ti_armv7_common.h                  |    8 -
 include/configs/tricorder.h                        |    4 +-
 include/cpsw.h                                     |    1 +
 include/power/pmic.h                               |    1 +
 include/power/tps65218.h                           |    1 +
 82 files changed, 2038 insertions(+), 1298 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2e.c
 create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2hk.c
 create mode 100644 arch/arm/cpu/armv7/keystone/keystone.c
 delete mode 100644 arch/arm/cpu/armv7/omap3/mem.c
 create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2e.h
 create mode 100644 arch/arm/include/asm/arch-keystone/ddr3.h
 create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2e.h
 create mode 100644 arch/arm/include/asm/arch-keystone/mon.h
 create mode 100644 arch/arm/include/asm/arch-keystone/msmc.h
 delete mode 100644 board/ti/k2hk_evm/Makefile
 delete mode 100644 board/ti/k2hk_evm/ddr3.c
 create mode 100644 board/ti/ks2_evm/Makefile
 rename board/ti/{k2hk_evm/README => ks2_evm/README_K2HK} (80%)
 rename board/ti/{k2hk_evm => ks2_evm}/board.c (65%)
 create mode 100644 board/ti/ks2_evm/board.h
 create mode 100644 board/ti/ks2_evm/board_k2e.c
 create mode 100644 board/ti/ks2_evm/board_k2hk.c
 create mode 100644 board/ti/ks2_evm/ddr3_cfg.c
 create mode 100644 board/ti/ks2_evm/ddr3_cfg.h
 create mode 100644 board/ti/ks2_evm/ddr3_k2e.c
 create mode 100644 board/ti/ks2_evm/ddr3_k2hk.c
 create mode 100644 include/configs/k2e_evm.h
 create mode 100644 include/configs/ks2_evm.h

Note that this does break tricorder boards for now but it's due to
fixing another bug in other boards and now we need to address moving the
stack around and testing that on the tricorder boards.  I think we can
just pick this up later.  Thanks!

Comments

Albert ARIBAUD July 29, 2014, 11:55 a.m. UTC | #1
Hi Tom,

(seems like I had not sent this yesterday)

On Fri, 25 Jul 2014 21:29:15 -0400, Tom Rini <trini@ti.com> wrote:

> Hey,
> 
> The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:
> 
>   socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-ti.git master
> 
> for you to fetch changes up to 434f2cfcad9f70231ad5a096325ba72ef0d2a2cc:
> 
>   ARM: omap: move board specific NAND configs out from ti_armv7_common.h (2014-07-25 16:26:12 -0400)
> 
> ----------------------------------------------------------------
> Andreas Bießmann (1):
>       tricorder: convert to generic board
> 
> Hao Zhang (10):
>       keystone2: ddr: add DDR3 PHY configs updated for PG 2.0
>       keystone2: move cpu_to_bus() to keystone.c
>       keystone2: add possibility to turn off all dsps
>       ARM: keystone2: move K2HK board files to common KS2 board directory
>       configs: k2hk_evm: config: add common EVM configuration header
>       keystone: ddr3: move K2HK DDR3 configuration to a common file
>       ARM: keystone2: add K2E SoC hardware definitions
>       ARM: keystone2: clock: add K2E clock support
>       ARM: keystone2: add MSMC cache coherency support for K2E SOC
>       board: k2e-evm: add board support
> 
> Khoronzhuk, Ivan (10):
>       mtd: nand: davinci: add opportunity to write keystone U-boot image
>       keystone: add support for NAND gpheader image
>       k2hk_evm: add script to automate NAND flash process
>       ARM: keystone2: psc: use common PSC base
>       keystone: ddr3: add ddr3.h to hold ddr3 API
>       ARM: keystone2: keystone_nav: make it dependent on keystone driver
>       k2hk: use common KS2_ prefix for all hardware definitions
>       ARM: keystone: clock: move K2HK SoC dependent code in separate file
>       keystone2: use CONFIG_SOC_KEYSTONE in common places
>       ARM: keystone2: spl: add K2E SoC support
> 
> Mugunthan V N (3):
>       drivers: net: cpsw: add support for using second port as ethernet
>       ARM: DRA7xx: Add cpsw second port pinmux
>       ARM: dra7_evm: Add Ethernet support for dra72x platform
> 
> Murali Karicheri (1):
>       keystone2: add env option to do unitrd dt fixup
> 
> Rajendra Nayak (1):
>       ARM: OMAP: Fix handling of errata i727
> 
> Stefan Roese (3):
>       ARM: omap: Fix GPMC init for OMAP3 platforms
>       ARM: omap: Remove unused arch/arm/cpu/armv7/omap3/mem.c
>       ARM: omap: tao3530: Convert to generic board
> 
> Tom Rini (3):
>       power/pmic.h: Add prototype for power_init_board.
>       tps65218/am43xx_evm: Add power framework support to TPS65218
>       am335x_evm / gumstix pepper: Correct DDR settings
> 
> pekon gupta (3):
>       ARM: omap: fix GPMC address-map size for NAND and NOR devices
>       ARM: omap: clean redundant PISMO_xx macros used in OMAP3
>       ARM: omap: move board specific NAND configs out from ti_armv7_common.h
> 
>  Makefile                                           |    6 +
>  arch/arm/cpu/armv7/keystone/Makefile               |    5 +-
>  arch/arm/cpu/armv7/keystone/clock-k2e.c            |  101 +++++++
>  arch/arm/cpu/armv7/keystone/clock-k2hk.c           |  113 ++++++++
>  arch/arm/cpu/armv7/keystone/clock.c                |  154 ++---------
>  arch/arm/cpu/armv7/keystone/cmd_clock.c            |   31 ++-
>  arch/arm/cpu/armv7/keystone/ddr3.c                 |   25 +-
>  arch/arm/cpu/armv7/keystone/init.c                 |   16 +-
>  arch/arm/cpu/armv7/keystone/keystone.c             |   87 +++++++
>  arch/arm/cpu/armv7/keystone/msmc.c                 |    6 +-
>  arch/arm/cpu/armv7/keystone/psc.c                  |   42 ++-
>  arch/arm/cpu/armv7/keystone/spl.c                  |    8 +
>  arch/arm/cpu/armv7/omap-common/hwinit-common.c     |    3 +-
>  arch/arm/cpu/armv7/omap-common/mem-common.c        |   15 +-
>  arch/arm/cpu/armv7/omap3/mem.c                     |  139 ----------
>  arch/arm/include/asm/arch-am33xx/ddr_defs.h        |    4 -
>  arch/arm/include/asm/arch-am33xx/mem.h             |    7 -
>  arch/arm/include/asm/arch-keystone/clock-k2e.h     |   68 +++++
>  arch/arm/include/asm/arch-keystone/clock-k2hk.h    |   23 +-
>  arch/arm/include/asm/arch-keystone/clock.h         |   32 +++
>  arch/arm/include/asm/arch-keystone/clock_defs.h    |    2 +-
>  arch/arm/include/asm/arch-keystone/ddr3.h          |   56 ++++
>  arch/arm/include/asm/arch-keystone/hardware-k2e.h  |   44 ++++
>  arch/arm/include/asm/arch-keystone/hardware-k2hk.h |  182 +++++--------
>  arch/arm/include/asm/arch-keystone/hardware.h      |  117 ++++++---
>  arch/arm/include/asm/arch-keystone/mon.h           |   15 ++
>  arch/arm/include/asm/arch-keystone/msmc.h          |   17 ++
>  arch/arm/include/asm/arch-omap3/cpu.h              |    1 -
>  arch/arm/include/asm/arch-omap3/mem.h              |   13 -
>  arch/arm/include/asm/omap_common.h                 |    8 +
>  board/gumstix/pepper/board.c                       |   30 +--
>  board/ti/am335x/board.c                            |   30 +--
>  board/ti/am43xx/board.c                            |   14 +
>  board/ti/dra7xx/evm.c                              |    7 +-
>  board/ti/dra7xx/mux_data.h                         |   12 +
>  board/ti/k2hk_evm/Makefile                         |    9 -
>  board/ti/k2hk_evm/ddr3.c                           |  268 -------------------
>  board/ti/ks2_evm/Makefile                          |   13 +
>  board/ti/{k2hk_evm/README => ks2_evm/README_K2HK}  |   28 +-
>  board/ti/{k2hk_evm => ks2_evm}/board.c             |  156 +++--------
>  board/ti/ks2_evm/board.h                           |   19 ++
>  board/ti/ks2_evm/board_k2e.c                       |   39 +++
>  board/ti/ks2_evm/board_k2hk.c                      |   81 ++++++
>  board/ti/ks2_evm/ddr3_cfg.c                        |  170 ++++++++++++
>  board/ti/ks2_evm/ddr3_cfg.h                        |   24 ++
>  board/ti/ks2_evm/ddr3_k2e.c                        |   55 ++++
>  board/ti/ks2_evm/ddr3_k2hk.c                       |   84 ++++++
>  boards.cfg                                         |    3 +-
>  common/image-fdt.c                                 |    2 +-
>  doc/README.nand                                    |   12 +
>  drivers/mtd/nand/davinci_nand.c                    |  196 ++++++++++++++
>  drivers/net/cpsw.c                                 |    8 +-
>  drivers/power/pmic/pmic_tps65218.c                 |   22 ++
>  drivers/serial/ns16550.c                           |    4 +-
>  include/configs/am335x_evm.h                       |    6 +
>  include/configs/am3517_crane.h                     |    7 +-
>  include/configs/am3517_evm.h                       |    7 +-
>  include/configs/am43xx_evm.h                       |    2 +
>  include/configs/cm_t335.h                          |    5 +
>  include/configs/cm_t35.h                           |    3 -
>  include/configs/devkit8000.h                       |    2 -
>  include/configs/dig297.h                           |    4 -
>  include/configs/k2e_evm.h                          |   37 +++
>  include/configs/k2hk_evm.h                         |  253 +-----------------
>  include/configs/ks2_evm.h                          |  275 ++++++++++++++++++++
>  include/configs/mcx.h                              |    4 -
>  include/configs/nokia_rx51.h                       |    2 -
>  include/configs/omap3_beagle.h                     |   13 +-
>  include/configs/omap3_evm_common.h                 |    7 +-
>  include/configs/omap3_igep00x0.h                   |   10 +-
>  include/configs/omap3_logic.h                      |    8 +-
>  include/configs/omap3_overo.h                      |   12 +-
>  include/configs/omap3_pandora.h                    |    7 +-
>  include/configs/omap3_zoom1.h                      |   13 +-
>  include/configs/pengwyn.h                          |    6 +
>  include/configs/tam3517-common.h                   |    4 -
>  include/configs/tao3530.h                          |    8 +-
>  include/configs/ti_armv7_common.h                  |    8 -
>  include/configs/tricorder.h                        |    4 +-
>  include/cpsw.h                                     |    1 +
>  include/power/pmic.h                               |    1 +
>  include/power/tps65218.h                           |    1 +
>  82 files changed, 2038 insertions(+), 1298 deletions(-)
>  create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2e.c
>  create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2hk.c
>  create mode 100644 arch/arm/cpu/armv7/keystone/keystone.c
>  delete mode 100644 arch/arm/cpu/armv7/omap3/mem.c
>  create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2e.h
>  create mode 100644 arch/arm/include/asm/arch-keystone/ddr3.h
>  create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2e.h
>  create mode 100644 arch/arm/include/asm/arch-keystone/mon.h
>  create mode 100644 arch/arm/include/asm/arch-keystone/msmc.h
>  delete mode 100644 board/ti/k2hk_evm/Makefile
>  delete mode 100644 board/ti/k2hk_evm/ddr3.c
>  create mode 100644 board/ti/ks2_evm/Makefile
>  rename board/ti/{k2hk_evm/README => ks2_evm/README_K2HK} (80%)
>  rename board/ti/{k2hk_evm => ks2_evm}/board.c (65%)
>  create mode 100644 board/ti/ks2_evm/board.h
>  create mode 100644 board/ti/ks2_evm/board_k2e.c
>  create mode 100644 board/ti/ks2_evm/board_k2hk.c
>  create mode 100644 board/ti/ks2_evm/ddr3_cfg.c
>  create mode 100644 board/ti/ks2_evm/ddr3_cfg.h
>  create mode 100644 board/ti/ks2_evm/ddr3_k2e.c
>  create mode 100644 board/ti/ks2_evm/ddr3_k2hk.c
>  create mode 100644 include/configs/k2e_evm.h
>  create mode 100644 include/configs/ks2_evm.h
> 
> Note that this does break tricorder boards for now but it's due to
> fixing another bug in other boards and now we need to address moving the
> stack around and testing that on the tricorder boards.  I think we can
> just pick this up later.  Thanks!
> 

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

Amicalement,