10 Nov, 2013

1 commit

• 85b8c5c4b   Merge branch 'iu-boot/master' into 'u-boot-arm/master' ... Browse Code »

  Conflicts:
  arch/arm/cpu/arm926ejs/mxs/Makefile
  board/compulab/cm_t35/Makefile
  board/corscience/tricorder/Makefile
  board/ppcag/bg0900/Makefile
  drivers/bootcount/Makefile
  include/configs/omap4_common.h
  include/configs/pdnb3.h

  Makefile conflicts are due to additions/removals of
  object files on the ARM branch vs KBuild introduction
  on the main branch. Resolution consists in adjusting
  the list of object files in the main branch version.
  This also applies to two files which are not listed
  as conflicting but had to be modified:

  board/compulab/common/Makefile
  board/udoo/Makefile

  include/configs/omap4_common.h conflicts are due to
  the OMAP4 conversion to ti_armv7_common.h on the ARM
  side, and CONFIG_SYS_HZ removal on the main side.
  Resolution is to convert as this icludes removal of
  CONFIG_SYS_HZ.

  include/configs/pdnb3.h is due to a removal on ARM side.
  Trivial resolution is to remove the file.

  Note: 'git show' will also list two files just because
  they are new:

  include/configs/am335x_igep0033.h
  include/configs/omap3_igep00x0.h

  Albert ARIBAUD

  2013-11-10 05:59:47 +0800  

01 Nov, 2013

1 commit

• 465ac5891   ARM: mxs: Configure 2 Gbit DDR2 RAM for BG0900 ... Browse Code »

  The BG0900 module has 2Gbit DRAM module on it, adjust the DataBahn
  DRAM controller registers so the DRAM module will be correctly
  recognised.

  Signed-off-by: Christoph G. Baumann
  Cc: Marek Vasut
  Cc: Stefano Babic
  Cc: Fabio Estevam

  Christoph G. Baumann

  2013-11-01 00:54:23 +0800  

17 Oct, 2013

1 commit

• f97271612   ARM: mxs: Add PPC-AG BG0900 board ... Browse Code »

  This board supports FEC Ethernet, SPI NOR and NAND flash.

  Signed-off-by: Marek Vasut
  Cc: Stefano Babic
  Cc: Christoph Baumann

  Marek Vasut

  2013-10-17 15:44:20 +0800