31 Mar, 2015

1 commit


17 Nov, 2014

1 commit


15 Jun, 2014

1 commit


27 May, 2014

2 commits


09 Dec, 2013

1 commit


10 Nov, 2013

1 commit

  • 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
     

05 Nov, 2013

2 commits


24 Jul, 2013

2 commits


23 Jul, 2013

1 commit


01 Sep, 2012

1 commit


21 Jun, 2012

2 commits


12 Feb, 2012

1 commit

  • CONFIG_NET_MULTI is not used anymore, so remove it from board files.

    Cc: Marek Vasut
    Cc: Stefano Babic
    Cc: Kumar Gala
    Cc: Sandeep Paulraj
    Signed-off-by: Fabio Estevam
    Acked-by: Tom Rini
    Acked-by: Mike Frysinger
    Acked-by: Marek Vasut
    Acked-by: Heiko Schocher
    Acked-by: Kumar Gala
    Acked-by: Stefano Babic
    Tested-by: Marek Vasut
    Tested-by: Heiko Schocher

    Fabio Estevam
     

07 Dec, 2011

1 commit

  • Add support for the Ethernut 5 open hardware design, based
    on Atmel's AT91SAM9XE512 SoC.

    V4
    - Fix several coding style issues.
    - Move machine type to config file.
    - Remove use of CONFIG_ATMEL_LEGACY.

    Signed-off-by: Tim Schendekehl

    Tim Schendekehl