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  

02 Nov, 2013

1 commit

• 660a2e650   arm, da85x: update for the ipam390 board ... Browse Code »

  - switch to correct ecc layout used by the RBL
  enable CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
  - update default environment
  - change A2CR to correct value for UART boot mode
  - adapt cs3cfg timings for nand
  - change LED bootmode signalization

  Signed-off-by: Heiko Schocher
  Cc: Tom Rini

  Heiko Schocher

  2013-11-02 03:30:51 +0800  

01 Nov, 2013

1 commit

• a79854a90   board: arm: convert makefiles to Kbuild style ... Browse Code »

  Signed-off-by: Masahiro Yamada
  Cc: Albert ARIBAUD
  Cc: Andreas Bießmann
  Cc: Stefano Babic
  Cc: Prafulla Wadaskar
  Cc: Minkyu Kang
  Cc: Vipin Kumar
  Cc: Tom Warren
  Cc: Tom Rini

  Masahiro Yamada

  2013-11-01 23:42:12 +0800  

15 Oct, 2013

1 commit

• 93e145964   Coding Style cleanup: replace leading SPACEs by TABs ... Browse Code »

  Signed-off-by: Wolfgang Denk
  [trini: Drop changes for PEP 4 following python tools]
  Signed-off-by: Tom Rini

  Wolfgang Denk

  2013-10-15 04:06:54 +0800  

16 Aug, 2013

1 commit

• 03efcb050   arm, da850: add ipam390 board support ... Browse Code »

  add the am1808 based ipam390 board from Barix.

  - 128MByte, DDR2, synchronous RAM 16bit databus to SDRAM
  interface
  - 128MByte, NAND Flash, 8bit databus to the NANDFlash
  Interface
  - Ethernet PHY Micrel KSZ8051R via RMII
  - Console on UART 0
  - booting fron nand flash
  - spl falcon bootmode

  Signed-off-by: Heiko Schocher
  Cc: Tom Rini

  Heiko Schocher

  2013-08-16 06:38:36 +0800