]> code.ossystems Code Review - bsp/u-boot.git/commitdiff
Merge tag 'v2013.04-rc3' into patches-2013.04
authorOtavio Salvador <otavio@ossystems.com.br>
Mon, 15 Apr 2013 21:55:16 +0000 (18:55 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Mon, 15 Apr 2013 21:55:16 +0000 (18:55 -0300)
Prepare v2013.04-rc3

* tag 'v2013.04-rc3': (175 commits)
  Prepare v2013.04-rc3
  cosmetic: fix CONFIG_SPL_BSS_MAX_SIZE typo in README
  smdk5250, snow: convert to CONFIG_SPL_MAX_FOOTPRINT
  da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT
  cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT
  ARM: fix CONFIG_SPL_MAX_SIZE semantics
  fsl_esdhc: Fix DMA transfer completion waiting loop
  fsl_esdhc: flush cache after IO completion
  ARM: Fix __bss_start and __bss_end in linker scripts
  spi: mxc_spi: Set master mode for all channels
  mx6qsabre{sd, auto}: Fix environment as 'mmc rescan' takes no arguments
  BUGFIX: arm: data abort in get_bad_stack_swi
  tpm: Add TPM command library
  exynos: Enable I2C TPM for smdk5250
  tpm: Add Infineon slb9635_i2c TPM driver
  tpm: Add casts for proper compilation
  integrator: enable device tree
  VCMA9: Enable CONFIG_CMD_NAND_YAFFS
  omap5_common.h: Switch to ext4
  omap3: Display MHz instead of mHz on the console
  ...

Conflicts:
MAINTAINERS
include/configs/wandboard.h

1  2 
MAINTAINERS
arch/arm/include/asm/arch-mx6/imx-regs.h
boards.cfg

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge