Eric Lee / smarc-uboot

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
     

01 Nov, 2013

2 commits

16 Oct, 2013

1 commit

  • 8c4dba1a5   microblaze: Fix watchdog initialization ... Browse Code »

    The patch:
    "blackfin: Move blackfin watchdog driver out of the blackfin arch folder."
    (sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63)
    changed hw_watchdog_init() prototype which didn't match
    with Microblaze one.
    This patch fixes the driver and Microblaze initialization.

    Signed-off-by: Michal Simek

    Michal Simek
     

15 Oct, 2013

1 commit

28 Aug, 2013

1 commit

24 Jul, 2013

1 commit

08 Jun, 2013

1 commit

03 Jun, 2013

1 commit

13 May, 2013

1 commit

30 Apr, 2013

1 commit

13 Jan, 2013

1 commit

15 Nov, 2012

1 commit

18 Oct, 2012

1 commit

18 May, 2011

2 commits

13 Apr, 2011

1 commit

  • 04c2dd827   ftwdt010_wdt: move header to include/faraday and enhance ... Browse Code »

    1. Move header to include/faraday
    2. Fix include path in ftwdt010_wdt.c
    3. Fix function prototype and declaration to
    - ftwdt010_wdt_settimeout
    - ftwdt010_wdt_reset
    - ftwdt010_wdt_disable
    4. Add "#if definde (CONFIG_HW_WATCHDOG)" let user have flexibilty
    to choose which better to his product.

    Signed-off-by: Macpaul Lin

    Macpaul Lin
     

12 Apr, 2011

1 commit

18 Nov, 2010

1 commit

  • 6d8962e81   Switch from archive libraries to partial linking ... Browse Code »

    Before this commit, weak symbols were not overridden by non-weak symbols
    found in archive libraries when linking with recent versions of
    binutils. As stated in the System V ABI, "the link editor does not
    extract archive members to resolve undefined weak symbols".

    This commit changes all Makefiles to use partial linking (ld -r) instead
    of creating library archives, which forces all symbols to participate in
    linking, allowing non-weak symbols to override weak symbols as intended.
    This approach is also used by Linux, from which the gmake function
    cmd_link_o_target (defined in config.mk and used in all Makefiles) is
    inspired.

    The name of each former library archive is preserved except for
    extensions which change from ".a" to ".o". This commit updates
    references accordingly where needed, in particular in some linker
    scripts.

    This commit reveals board configurations that exclude some features but
    include source files that depend these disabled features in the build,
    resulting in undefined symbols. Known such cases include:
    - disabling CMD_NET but not CMD_NFS;
    - enabling CONFIG_OF_LIBFDT but not CONFIG_QE.

    Signed-off-by: Sebastien Carlier

    Sebastien Carlier
     

04 Apr, 2010

1 commit

05 Apr, 2009

1 commit