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

Tom Rini trini at ti.com
Fri May 9 18:15:25 CEST 2014


On Fri, May 09, 2014 at 11:56:56AM +0200, Albert ARIBAUD wrote:

> Hello Tom,
> 
> The following changes since commit
> 173d294b94cfec10063a5be40934d6d8fb7981ce:
> 
>   Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze
>   (2014-05-06 14:55:45 -0400)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-arm master
> 
> for you to fetch changes up to d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19:
> 
>   Merge branch 'u-boot/master' (2014-05-09 11:50:14 +0200)
> 
> Note that there was a trivial merge conflict between ARM and mainline
> trees on drivers/net/Makefile:
> 
> 	<<<<<<< HEAD
> 	obj-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
> 	obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o
> 	=======
> 	>>>>>>> u-boot/master
> 
> This is solved in the ARM ToT commit d2a3e911.
> 
> ----------------------------------------------------------------
> 
> Albert ARIBAUD (3):
>       Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
>       Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
>       Merge branch 'u-boot/master'
> 
> Karicheri, Muralidharan (6):
>       tools: mkimage: add support for gpimage format
>       NAND: DaVinci: allow forced disable of subpage writes
>       i2c, davinci: move i2c_defs.h to the drivers/i2c directory
>       spi: davinci: add support for multiple bus and chip select
>       k2hk-evm: add configuration for spi1 and spi2 support
>       keystone2: net: add keystone ethernet driver
> 
> Manish Badarkhe (1):
>       arm, da850: staticize funtions
> 
> Nishanth Menon (11):
>       OMAP: common: consolidate fake USB ethernet MAC address creation
>       omap3/sys_info: provide interface to read die id
>       OMAP3: beagle-xm: generate fake USB ethernet MAC address from
> dieid omap3: zoom1: enable CONFIG_SYS_GENERIC_BOARD
>       OMAP3: zoom1: Configure GPMC for Ethernet
>       OMAP3: zoom1: enable LAN9211
>       omap3: zoom1: enable common network commands
>       omap3: zoom1: disable JFFS2 and enable FS_GENERIC
>       omap3: zoom1: enable bootz
>       omap3: zoom1: fix default console
>       omap3: zoom1: switch to generic ti_omap3_common config header
> 
> Poddar, Sourav (1):
>       spi: ti_qspi: Add delay for successful bulk erase.
> 
> Rob Herring (2):
>       ARM: highbank: use config_distro_defaults.h
>       ARM: highbank: use default prompt
> 
> Stefan Agner (3):
>       usb: tegra: fix USB2 powerdown for Tegra30 and later
>       usb: tegra: fix PHY configuration
>       usb: tegra: combine header file
> 
> Stephen Warren (14):
>       ARM: tegra: pinctrl: remove func_safe
>       ARM: tegra: pinctrl: remove vddio
>       ARM: tegra: pinctrl: make pmux_func values consistent on Tegra20
>       ARM: tegra: prototype pinmux_init() in board.h
>       ARM: tegra: use apb_misc.h in more places
>       ARM: tegra: pinctrl: remove duplication
>       ARM: tegra: reduce public pinmux API
>       ARM: tegra: pinmux naming consistency fixes
>       ARM: tegra: Tegra20 pinmux cleanup
>       ARM: tegra: Tegra30 pinmux cleanup
>       ARM: tegra: Tegra114 pinmux cleanup
>       ARM: tegra: Tegra124 pinmux cleanup
>       ARM: tegra: add Jetson TK1 board
>       ARM: tegra: pack pinmux data tables tighter
> 
> Tom Rini (22):
>       fw_env.c: Switch get_config to use '%ms' in sscanf
>       env_mmc.c: Allow environment to be used within SPL
>       env_mmc.c: Remove NULL check on tmp_env1/2
>       mtd: Add a CONFIG_SPL_MTD_SUPPORT for a more full NAND subsystem
> in SPL mtd: Build nand_util.o for CONFIG_ENV_IS_IN_NAND in SPL
>       am335x_evm: Make SPL_OS also check the boot_os variable for
> falcon mode README: Add CONFIG_SPL_OS_BOOT to README
>       README.falcon: Document environment variables for falcon mode
>       a3m071: Make spl_start_uboot test like getenv_yesno does
>       spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what
> to boot TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
>       am335x_evm: Update the ramdisk args, we pass things in just fine
> via DT am43xx_evm: Update the ramdisk args, we pass things in just fine
> via DT TI:omap5: Move CONFIG_ENV_SIZE to board config files
>       TI:armv7: Change Falcon Mode DT load address
>       am335x_evm: Drop SPI SPL support from the default build
>       SPL:SPI: Add Falcon Mode support
>       dra7xx_evm: Add QSPI_4 support, qspiboot build target
>       TI:armv7: Switch to CONFIG_SYS_BOARD_GENERIC
>       TI:omap3: Convert omap3_beagle to ti_omap3_common.h
>       am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or
> NOR_BOOT am43xx_evm: Drop SPI SPL
> 
> Vitaly Andrianov (5):
>       fdt: call ft_board_setup_ex() at the end of image_setup_libfdt()
>       arm: add support for arch timer
>       i2c, davinci: convert driver to new mutlibus/mutliadapter
> framework k2hk: add support for k2hk SOC and EVM
>       keystone2: add keystone multicore navigator driver
> 
> Wolfgang Denk (3):
>       ARM: OMAP: remove sr32() from OMAP board code
>       ARM: OMAP: hide custom bit manipulation function sr32()
>       ARM: OMAP: replace custom sr32() by standard I/O accessors
> 
>  Makefile                                                     |  10 ++
>  README                                                       |  13 ++
>  arch/arm/cpu/arm720t/tegra-common/spl.c                      |   6 +-
>  arch/arm/cpu/arm720t/tegra114/cpu.c                          |   4 +-
>  arch/arm/cpu/arm720t/tegra124/cpu.c                          |   4 +-
>  arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c              |   6 +-
>  arch/arm/cpu/arm926ejs/davinci/dm355.c                       |   2 +-
>  arch/arm/cpu/arm926ejs/davinci/dm365.c                       |   2 +-
>  arch/arm/cpu/arm926ejs/davinci/dm644x.c                      |   2 +-
>  arch/arm/cpu/arm926ejs/davinci/dm646x.c                      |   2 +-
>  arch/arm/cpu/armv7/Makefile                                  |   1 +
>  arch/arm/cpu/armv7/am33xx/board.c                            |   4 +-
>  arch/arm/cpu/armv7/am33xx/emif4.c                            |   2 +-
>  arch/arm/cpu/armv7/arch_timer.c                              |  58
>  +++++++ arch/arm/cpu/armv7/keystone/Makefile
>  |  17 ++ arch/arm/cpu/armv7/keystone/aemif.c
>  |  71 ++++++++
>  arch/arm/cpu/armv7/keystone/clock.c                          | 318
>  +++++++++++++++++++++++++++++++++++
>  arch/arm/cpu/armv7/keystone/cmd_clock.c                      | 124
>  ++++++++++++++
>  arch/arm/cpu/armv7/keystone/cmd_mon.c                        | 131
>  +++++++++++++++
>  arch/arm/cpu/armv7/keystone/ddr3.c                           |  69
>  ++++++++ arch/arm/cpu/armv7/keystone/init.c
>  |  56 ++++++
>  arch/arm/cpu/armv7/keystone/keystone_nav.c                   | 376
>  +++++++++++++++++++++++++++++++++++++++++
>  arch/arm/cpu/armv7/keystone/msmc.c                           |  68
>  ++++++++ arch/arm/cpu/armv7/keystone/psc.c
>  | 237 ++++++++++++++++++++++++++
>  arch/arm/cpu/armv7/keystone/spl.c                            |  45
>  +++++ arch/arm/cpu/armv7/omap-common/boot-common.c                 |
>  11 ++ arch/arm/cpu/armv7/omap-common/utils.c                       |
>  21 +++ arch/arm/cpu/armv7/omap3/board.c
>  |   4 +- arch/arm/cpu/armv7/omap3/clock.c
>  | 355 +++++++++++++++++++++-----------------
>  arch/arm/cpu/armv7/omap3/sys_info.c                          |  19 ++-
>  arch/arm/cpu/armv7/syslib.c                                  |  13 --
>  arch/arm/cpu/tegra-common/Makefile                           |   6 +-
>  arch/arm/cpu/tegra-common/pinmux-common.c                    | 508
>  +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  arch/arm/cpu/tegra114-common/funcmux.c                       |  32
>  ++-- arch/arm/cpu/tegra114-common/pinmux.c                        |
>  895
>  ++++++++++++++++++++++++------------------------------------------------------------------------
>  arch/arm/cpu/tegra124-common/funcmux.c                       |  38
>  +++-- arch/arm/cpu/tegra124-common/pinmux.c                        |
>  898
>  ++++++++++++++++++++++++++-----------------------------------------------------------------------
>  arch/arm/cpu/tegra20-common/emc.c                            |   2 +-
>  arch/arm/cpu/tegra20-common/funcmux.c                        | 185
>  ++++++++++----------
>  arch/arm/cpu/tegra20-common/pinmux.c                         | 416
>  ++++++++++++++++-----------------------------
>  arch/arm/cpu/tegra20-common/warmboot.c                       |   8 +-
>  arch/arm/cpu/tegra20-common/warmboot_avp.c                   |   6 +-
>  arch/arm/cpu/tegra30-common/funcmux.c                        |  20 ++-
>  arch/arm/cpu/tegra30-common/pinmux.c                         | 948
>  +++++++++++++++++++++++++++++-------------------------------------------------------------------------
>  arch/arm/dts/Makefile                                        |   1 +
>  arch/arm/dts/tegra124-jetson-tk1.dts                         |  84
>  +++++++++ arch/arm/include/asm/arch-davinci/da850_lowlevel.h
>  |   3 - arch/arm/include/asm/arch-davinci/i2c_defs.h
>  |  71 +-------
>  arch/arm/include/asm/arch-keystone/clock-k2hk.h              | 109
>  ++++++++++++
>  arch/arm/include/asm/arch-keystone/clock.h                   |  17 ++
>  arch/arm/include/asm/arch-keystone/clock_defs.h              | 111
>  ++++++++++++
>  arch/arm/include/asm/arch-keystone/emac_defs.h               | 240
>  ++++++++++++++++++++++++++
>  arch/arm/include/asm/arch-keystone/emif_defs.h               |  73
>  ++++++++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h
>  | 150 +++++++++++++++++
>  arch/arm/include/asm/arch-keystone/hardware.h                | 175
>  +++++++++++++++++++
>  arch/arm/include/asm/arch-keystone/i2c_defs.h                |  17 ++
>  arch/arm/include/asm/arch-keystone/keystone_nav.h            | 193
>  +++++++++++++++++++++
>  arch/arm/include/asm/arch-keystone/nand_defs.h               |  23 +++
>  arch/arm/include/asm/arch-keystone/psc_defs.h                |  90
>  ++++++++++
>  arch/arm/include/asm/arch-keystone/spl.h                     |  12 ++
>  arch/arm/include/asm/arch-omap3/sys_proto.h                  |   3 +-
>  arch/arm/include/asm/arch-omap4/sys_proto.h                  |   1 -
>  arch/arm/include/asm/arch-omap5/sys_proto.h                  |   1 -
>  arch/arm/include/asm/{arch-tegra20 => arch-tegra}/apb_misc.h |   2 +
>  arch/arm/include/asm/arch-tegra/board.h                      |   1 +
>  arch/arm/include/asm/arch-tegra/pinmux.h                     | 185
>  ++++++++++++++++++++
>  arch/arm/include/asm/arch-tegra/usb.h                        | 223
>  +++++++++++++++++++++++-
>  arch/arm/include/asm/arch-tegra114/pinmux.h                  | 836
>  +++++++++++++++++++++++++++++-------------------------------------------------------------
>  arch/arm/include/asm/arch-tegra114/usb.h                     | 156
>  -----------------
>  arch/arm/include/asm/arch-tegra124/pinmux.h                  | 866
>  ++++++++++++++++++++++++++++++++-------------------------------------------------------------
>  arch/arm/include/asm/arch-tegra124/usb.h                     | 268
>  -----------------------------
>  arch/arm/include/asm/arch-tegra20/pinmux.h                   | 372
>  +++++++++++++++-------------------------
>  arch/arm/include/asm/arch-tegra20/usb.h                      | 155
>  -----------------
>  arch/arm/include/asm/arch-tegra30/pinmux.h                   | 963
>  ++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
>  arch/arm/include/asm/arch-tegra30/usb.h                      | 168
>  ------------------
>  arch/arm/include/asm/omap_common.h                           |   2 +
>  board/a3m071/a3m071.c                                        |   3 +-
>  board/avionic-design/common/pinmux-config-tamonten-ng.h      | 492
>  ++++++++++++++++++++++++++---------------------------
>  board/avionic-design/common/tamonten-ng.c                    |  12 +-
>  board/avionic-design/common/tamonten.c                       |   4 +-
>  board/compal/paz00/paz00.c                                   |  22 +--
>  board/compulab/trimslice/trimslice.c                         |   4 +-
>  board/logicpd/zoom1/config.mk                                |   1 -
>  board/logicpd/zoom1/zoom1.c                                  |  38
>  ++++- board/logicpd/zoom1/zoom1.h                                  |
>  19 ++- board/nvidia/cardhu/cardhu.c
>  |   6 +- board/nvidia/cardhu/pinmux-config-cardhu.h
>  | 498 +++++++++++++++++++++++++++---------------------------
>  board/nvidia/common/board.c                                  |   9 +-
>  board/nvidia/dalmore/dalmore.c                               |   9 +-
>  board/nvidia/dalmore/pinmux-config-dalmore.h                 | 388
>  +++++++++++++++++++++---------------------
>  board/nvidia/harmony/harmony.c                               |  18 +-
>  board/nvidia/jetson-tk1/Makefile                             |   9 +
>  board/nvidia/jetson-tk1/jetson-tk1.c                         |  23 +++
>  board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h           | 227
>  +++++++++++++++++++++++++
>  board/nvidia/seaboard/seaboard.c                             |   6 +-
>  board/nvidia/venice2/as3722_init.h                           |   4 +
>  board/nvidia/venice2/pinmux-config-venice2.h                 | 360
>  +++++++++++++++++++--------------------
>  board/nvidia/venice2/venice2.c                               |  15 +-
>  board/silica/pengwyn/Makefile                                |   2 +-
>  board/ti/am335x/Makefile                                     |   2 +-
>  board/ti/am335x/board.c                                      |  15 +-
>  board/ti/beagle/beagle.c                                     |  11 ++
>  board/ti/dra7xx/evm.c                                        |  19 +++
>  board/ti/k2hk_evm/Makefile                                   |   9 +
>  board/ti/k2hk_evm/README                                     | 122
>  ++++++++++++++
>  board/ti/k2hk_evm/board.c                                    | 301
>  +++++++++++++++++++++++++++++++++
>  board/ti/k2hk_evm/ddr3.c                                     | 268
>  +++++++++++++++++++++++++++++
>  board/ti/omap5_uevm/evm.c                                    |  25 +--
>  board/ti/panda/panda.c                                       |  23 +--
>  board/toradex/colibri_t20-common/colibri_t20-common.c        |   8 +-
>  board/toradex/colibri_t20_iris/colibri_t20_iris.c            |   4 +-
>  boards.cfg                                                   |   5 +-
>  common/env_mmc.c                                             |  49
>  ++++-- common/image-fdt.c
>  |   5 + common/image.c
>  |   1 + common/spl/spl_fat.c
>  |  27 +++ doc/README.falcon
>  |  13 ++ drivers/i2c/Makefile
>  |   2 +- drivers/i2c/davinci_i2c.c
>  | 402 +++++++++++++++++++++++++------------------
>  drivers/i2c/davinci_i2c.h                                    |  78
>  +++++++++ drivers/mtd/nand/Makefile
>  |   3 + drivers/mtd/nand/am335x_spl_bch.c
>  |  54 +++---
>  drivers/mtd/nand/davinci_nand.c                              |   3 +
>  drivers/mtd/spi/spi_spl_load.c                               |  46
>  ++++- drivers/net/Makefile                                         |
>  2 + drivers/net/keystone_net.c                                   | 716
>  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  drivers/serial/ns16550.c                                     |   8 +
>  drivers/spi/davinci_spi.c                                    |  49
>  +++++- drivers/spi/davinci_spi.h                                    |
>  33 ++++ drivers/spi/tegra20_sflash.c
>  |   6 +- drivers/spi/ti_qspi.c
>  |   3 + drivers/usb/host/ehci-tegra.c
>  |  28 ++- drivers/video/tegra.c
>  |   4 +- include/configs/am335x_evm.h
>  |  25 ++- include/configs/am43xx_evm.h
>  |  17 +- include/configs/cam_enc_4xx.h
>  |   8 +- include/configs/da830evm.h
>  |   8 +- include/configs/da850evm.h
>  |   8 +- include/configs/davinci_dm355evm.h
>  |   8 +- include/configs/davinci_dm355leopard.h
>  |   8 +- include/configs/davinci_dm365evm.h
>  |   8 +- include/configs/davinci_dm6467evm.h
>  |   8 +- include/configs/davinci_dvevm.h
>  |   8 +- include/configs/davinci_schmoogie.h
>  |   8 +- include/configs/davinci_sffsdr.h
>  |   8 +- include/configs/davinci_sonata.h
>  |   8 +- include/configs/dra7xx_evm.h
>  |  38 ++++-
>  include/configs/ea20.h                                       |   7 +-
>  include/configs/enbw_cmc.h                                   |   8 +-
>  include/configs/highbank.h                                   |  26 +--
>  include/configs/jetson-tk1.h                                 |  79
>  +++++++++ include/configs/k2hk_evm.h
>  | 256 ++++++++++++++++++++++++++++
>  include/configs/omap3_beagle.h                               | 184
>  ++------------------
>  include/configs/omap3_zoom1.h                                | 167
>  ++++++------------
>  include/configs/omap5_uevm.h                                 |   1 +
>  include/configs/ti_am335x_common.h                           |   2 +
>  include/configs/ti_armv7_common.h                            |  34
>  +++- include/configs/ti_omap3_common.h                            |
>  4 + include/configs/ti_omap4_common.h                            |   6
>  +- include/configs/ti_omap5_common.h                            |   9
>  +- include/fdt_support.h                                        |   7
>  + include/image.h                                              |   1 +
>  spl/Makefile                                                 |   1 +
>  tools/Makefile                                               |   2 +
>  tools/env/fw_env.c                                           |  13 +-
>  tools/gpheader.h                                             |  40
>  +++++ tools/gpimage-common.c                                       |
>  80 +++++++++
>  tools/gpimage.c                                              |  77
>  +++++++++ tools/imagetool.c
>  |   2 + tools/imagetool.h
>  |   1 + tools/omapimage.c                                            |
>  104 ++----------
>  tools/omapimage.h                                            |   5 -
>  172 files changed, 10253 insertions(+), 7128 deletions(-) create mode
>  100644 arch/arm/cpu/armv7/arch_timer.c create mode 100644
>  arch/arm/cpu/armv7/keystone/Makefile create mode 100644
>  arch/arm/cpu/armv7/keystone/aemif.c create mode 100644
>  arch/arm/cpu/armv7/keystone/clock.c create mode 100644
>  arch/arm/cpu/armv7/keystone/cmd_clock.c create mode 100644
>  arch/arm/cpu/armv7/keystone/cmd_mon.c create mode 100644
>  arch/arm/cpu/armv7/keystone/ddr3.c create mode 100644
>  arch/arm/cpu/armv7/keystone/init.c create mode 100644
>  arch/arm/cpu/armv7/keystone/keystone_nav.c create mode 100644
>  arch/arm/cpu/armv7/keystone/msmc.c create mode 100644
>  arch/arm/cpu/armv7/keystone/psc.c create mode 100644
>  arch/arm/cpu/armv7/keystone/spl.c create mode 100644
>  arch/arm/cpu/tegra-common/pinmux-common.c create mode 100644
>  arch/arm/dts/tegra124-jetson-tk1.dts create mode 100644
>  arch/arm/include/asm/arch-keystone/clock-k2hk.h create mode 100644
>  arch/arm/include/asm/arch-keystone/clock.h create mode 100644
>  arch/arm/include/asm/arch-keystone/clock_defs.h create mode 100644
>  arch/arm/include/asm/arch-keystone/emac_defs.h create mode 100644
>  arch/arm/include/asm/arch-keystone/emif_defs.h create mode 100644
>  arch/arm/include/asm/arch-keystone/hardware-k2hk.h create mode 100644
>  arch/arm/include/asm/arch-keystone/hardware.h create mode 100644
>  arch/arm/include/asm/arch-keystone/i2c_defs.h create mode 100644
>  arch/arm/include/asm/arch-keystone/keystone_nav.h create mode 100644
>  arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644
>  arch/arm/include/asm/arch-keystone/psc_defs.h create mode 100644
>  arch/arm/include/asm/arch-keystone/spl.h rename
>  arch/arm/include/asm/{arch-tegra20 => arch-tegra}/apb_misc.h (87%)
>  create mode 100644 arch/arm/include/asm/arch-tegra/pinmux.h delete
>  mode 100644 arch/arm/include/asm/arch-tegra114/usb.h delete mode
>  100644 arch/arm/include/asm/arch-tegra124/usb.h delete mode 100644
>  arch/arm/include/asm/arch-tegra20/usb.h delete mode 100644
>  arch/arm/include/asm/arch-tegra30/usb.h create mode 100644
>  board/nvidia/jetson-tk1/Makefile create mode 100644
>  board/nvidia/jetson-tk1/jetson-tk1.c create mode 100644
>  board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h create mode 100644
>  board/ti/k2hk_evm/Makefile create mode 100644 board/ti/k2hk_evm/README
>  create mode 100644 board/ti/k2hk_evm/board.c create mode 100644
>  board/ti/k2hk_evm/ddr3.c create mode 100644 drivers/i2c/davinci_i2c.h
>  create mode 100644 drivers/net/keystone_net.c create mode 100644
>  include/configs/jetson-tk1.h create mode 100644
>  include/configs/k2hk_evm.h create mode 100644 tools/gpheader.h create
>  mode 100644 tools/gpimage-common.c create mode 100644 tools/gpimage.c

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140509/9e64cdcc/attachment.pgp>


More information about the U-Boot mailing list