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

Hey,
The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f:
arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-ti.git master
for you to fetch changes up to 12cc54376768461533b55ada1b0b6d4979f40579:
omap3: overo: Select fdtfile for expansion board (2014-06-19 17:53:59 -0400)
---------------------------------------------------------------- Ash Charles (3): omap: Don't enable GPMC CS0 with nothing attached omap4: duovero: Correct name of default device tree omap3: overo: Select fdtfile for expansion board
Axel Lin (1): spi: davinci: Fix register address for SPI1_BUS
Felipe Balbi (5): board: ti: am43xx: print unsupported board name cpu: armv7: am33x: ddr: write emif ref_ctrl_shadow register board: ti: am43xx: add support for AM43xx Starter Kit board: ti: am43xx: add AM437x SK PHY Address board: ti: am43xx: enable QSPI and Gbit Ethernet on AM437x SK
Jeroen Hofstee (1): omap3: board: trivial: add void for no args
Khoronzhuk, Ivan (2): mtd: nand: davinci: add header file for driver definitions ARM: keystone: aemif: move aemif driver to drivers/memory/ti-aemif.c
Stefano Babic (1): OMAP: disable gpmc timeout safely for reenabling
arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c | 1 + arch/arm/cpu/armv7/am33xx/ddr.c | 1 + arch/arm/cpu/armv7/keystone/Makefile | 1 - arch/arm/cpu/armv7/omap-common/mem-common.c | 6 +- arch/arm/cpu/armv7/omap3/board.c | 4 +- arch/arm/include/asm/arch-davinci/emif_defs.h | 72 ------------------ arch/arm/include/asm/arch-davinci/hardware.h | 1 - arch/arm/include/asm/arch-davinci/nand_defs.h | 38 ---------- arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 7 -- arch/arm/include/asm/arch-keystone/hardware.h | 30 +------- arch/arm/include/asm/arch-keystone/nand_defs.h | 23 ------ arch/arm/include/asm/arch-tnetv107x/emif_defs.h | 1 - arch/arm/include/asm/arch-tnetv107x/hardware.h | 2 + arch/arm/include/asm/arch-tnetv107x/nand_defs.h | 23 ------ .../emif_defs.h => ti-common/davinci_nand.h} | 55 ++++++++++---- arch/arm/include/asm/ti-common/ti-aemif.h | 39 ++++++++++ board/Barix/ipam390/ipam390.c | 2 +- board/ait/cam_enc_4xx/cam_enc_4xx.c | 2 +- board/davinci/da8xxevm/da830evm.c | 3 +- board/davinci/da8xxevm/da850evm.c | 2 +- board/davinci/dm355evm/dm355evm.c | 3 +- board/davinci/dm355leopard/dm355leopard.c | 2 +- board/davinci/dm365evm/dm365evm.c | 3 +- board/davinci/dm6467evm/dm6467evm.c | 3 +- board/davinci/ea20/ea20.c | 2 +- board/davinci/sonata/sonata.c | 2 +- board/enbw/enbw_cmc/enbw_cmc.c | 2 +- board/omicron/calimain/calimain.c | 2 +- board/overo/overo.c | 14 ++++ board/ti/am43xx/board.c | 79 +++++++++++++++++++- board/ti/am43xx/board.h | 5 ++ board/ti/am43xx/mux.c | 3 + board/ti/k2hk_evm/board.c | 10 +-- board/ti/tnetv107xevm/sdb_board.c | 2 +- drivers/Makefile | 1 + drivers/memory/Makefile | 1 + .../keystone/aemif.c => drivers/memory/ti-aemif.c | 37 +++++---- drivers/mtd/nand/davinci_nand.c | 3 +- drivers/spi/davinci_spi.c | 2 +- include/configs/am43xx_evm.h | 2 + include/configs/davinci_dm6467evm.h | 2 + include/configs/k2hk_evm.h | 6 ++ include/configs/omap3_overo.h | 10 +-- include/configs/ti_omap4_common.h | 2 +- 45 files changed, 255 insertions(+), 258 deletions(-) delete mode 100644 arch/arm/include/asm/arch-davinci/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-davinci/nand_defs.h delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/nand_defs.h rename arch/arm/include/asm/{arch-keystone/emif_defs.h => ti-common/davinci_nand.h} (56%) create mode 100644 arch/arm/include/asm/ti-common/ti-aemif.h create mode 100644 drivers/memory/Makefile rename arch/arm/cpu/armv7/keystone/aemif.c => drivers/memory/ti-aemif.c (63%)

Hi Tom,
On Thu, 19 Jun 2014 18:03:25 -0400, Tom Rini trini@ti.com wrote:
Hey,
The following changes since commit 0a26e1d6c394aacbf1153977b7348d1dff85db3f:
arm: fix a double-definition error of _start symbol (2014-06-09 10:36:40 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-ti.git master
for you to fetch changes up to 12cc54376768461533b55ada1b0b6d4979f40579:
omap3: overo: Select fdtfile for expansion board (2014-06-19 17:53:59 -0400)
Ash Charles (3): omap: Don't enable GPMC CS0 with nothing attached omap4: duovero: Correct name of default device tree omap3: overo: Select fdtfile for expansion board
Axel Lin (1): spi: davinci: Fix register address for SPI1_BUS
Felipe Balbi (5): board: ti: am43xx: print unsupported board name cpu: armv7: am33x: ddr: write emif ref_ctrl_shadow register board: ti: am43xx: add support for AM43xx Starter Kit board: ti: am43xx: add AM437x SK PHY Address board: ti: am43xx: enable QSPI and Gbit Ethernet on AM437x SK
Jeroen Hofstee (1): omap3: board: trivial: add void for no args
Khoronzhuk, Ivan (2): mtd: nand: davinci: add header file for driver definitions ARM: keystone: aemif: move aemif driver to drivers/memory/ti-aemif.c
Stefano Babic (1): OMAP: disable gpmc timeout safely for reenabling
arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c | 1 + arch/arm/cpu/armv7/am33xx/ddr.c | 1 + arch/arm/cpu/armv7/keystone/Makefile | 1 - arch/arm/cpu/armv7/omap-common/mem-common.c | 6 +- arch/arm/cpu/armv7/omap3/board.c | 4 +- arch/arm/include/asm/arch-davinci/emif_defs.h | 72 ------------------ arch/arm/include/asm/arch-davinci/hardware.h | 1 - arch/arm/include/asm/arch-davinci/nand_defs.h | 38 ---------- arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 7 -- arch/arm/include/asm/arch-keystone/hardware.h | 30 +------- arch/arm/include/asm/arch-keystone/nand_defs.h | 23 ------ arch/arm/include/asm/arch-tnetv107x/emif_defs.h | 1 - arch/arm/include/asm/arch-tnetv107x/hardware.h | 2 + arch/arm/include/asm/arch-tnetv107x/nand_defs.h | 23 ------ .../emif_defs.h => ti-common/davinci_nand.h} | 55 ++++++++++---- arch/arm/include/asm/ti-common/ti-aemif.h | 39 ++++++++++ board/Barix/ipam390/ipam390.c | 2 +- board/ait/cam_enc_4xx/cam_enc_4xx.c | 2 +- board/davinci/da8xxevm/da830evm.c | 3 +- board/davinci/da8xxevm/da850evm.c | 2 +- board/davinci/dm355evm/dm355evm.c | 3 +- board/davinci/dm355leopard/dm355leopard.c | 2 +- board/davinci/dm365evm/dm365evm.c | 3 +- board/davinci/dm6467evm/dm6467evm.c | 3 +- board/davinci/ea20/ea20.c | 2 +- board/davinci/sonata/sonata.c | 2 +- board/enbw/enbw_cmc/enbw_cmc.c | 2 +- board/omicron/calimain/calimain.c | 2 +- board/overo/overo.c | 14 ++++ board/ti/am43xx/board.c | 79 +++++++++++++++++++- board/ti/am43xx/board.h | 5 ++ board/ti/am43xx/mux.c | 3 + board/ti/k2hk_evm/board.c | 10 +-- board/ti/tnetv107xevm/sdb_board.c | 2 +- drivers/Makefile | 1 + drivers/memory/Makefile | 1 + .../keystone/aemif.c => drivers/memory/ti-aemif.c | 37 +++++---- drivers/mtd/nand/davinci_nand.c | 3 +- drivers/spi/davinci_spi.c | 2 +- include/configs/am43xx_evm.h | 2 + include/configs/davinci_dm6467evm.h | 2 + include/configs/k2hk_evm.h | 6 ++ include/configs/omap3_overo.h | 10 +-- include/configs/ti_omap4_common.h | 2 +- 45 files changed, 255 insertions(+), 258 deletions(-) delete mode 100644 arch/arm/include/asm/arch-davinci/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-davinci/nand_defs.h delete mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/emif_defs.h delete mode 100644 arch/arm/include/asm/arch-tnetv107x/nand_defs.h rename arch/arm/include/asm/{arch-keystone/emif_defs.h => ti-common/davinci_nand.h} (56%) create mode 100644 arch/arm/include/asm/ti-common/ti-aemif.h create mode 100644 drivers/memory/Makefile rename arch/arm/cpu/armv7/keystone/aemif.c => drivers/memory/ti-aemif.c (63%)
Applied to u-boot-arm/master, thanks -- and apologies for having missed it!
Amicalement,
participants (2)
-
Albert ARIBAUD
-
Tom Rini