Eric Lee / smarc-uboot

25 May, 2014

1 commit

24 May, 2014

3 commits

20 May, 2014

1 commit

15 May, 2014

1 commit

  • 2405d09c4   build: support a new image u-boot-dtb.img ... Browse Code »

    In SPL framework, SPL uses u-boot.img to load u-boot.bin.
    Here,
    u-boot.img = uImage header + u-boot.bin

    To use OF control with a separate devicetree,
    u-boot.dtb must be placed right after u-boot.bin.
    In this case, u-boot-dtb.bin is generally used.
    Here,
    u-boot-dtb.bin = u-boot.bin + u-boot.dtb

    We need u-boot-dtb.img to use both SPL framework
    and separate OF control at the same time.
    u-boot-dtb.img = uImage header + u-boot-dtb.bin

    For example, Zynq boards already define all of
    - CONFIG_SPL
    - CONFIG_OF_CONTROL
    - CONFIG_OF_SEPARATE

    So, the support of u-boot-dtb.img is urgent.

    Signed-off-by: Masahiro Yamada
    Cc: Michal Simek
    Acked-by: Simon Glass
    Signed-off-by: Michal Simek

    Masahiro Yamada
     

14 May, 2014

1 commit

  • 532d53182   arm, davinci: Use CONFIG_SPL_PAD_TO for padding the SPL in an ais image ... Browse Code »

    The commits

    commit b7b5f1a16ca66dfdd817e7339f0e263a5b9f2758
    Author: Albert ARIBAUD
    da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT

    and

    commit e7497891e34efe5cb2b3a3dc7c6c096c012ede28
    Author: Albert ARIBAUD
    cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT

    replaced CONFIG_SPL_MAX_SIZE by CONFIG_SPL_MAX_FOOTPRINT. However,
    CONFIG_SPL_MAX_SIZE is used in the Makefile for padding the SPL
    when preparing an u-boot.ais image. By removing CONFIG_SPL_MAX_SIZE
    said commits broke the ais image of the da850evm and cam_enc_4xx
    configurations.

    This patch converts the u-boot.ais target to use CONFIG_SPL_PAD_TO
    instead of CONFIG_SPL_MAX_SIZE for padding the SPL and adds
    a #define CONFIG_SPL_PAD_TO where it is required.

    Signed-off-by: Christian Riesch
    Reported-by: Tom Taylor
    Cc: Sudhakar Rajashekhara
    Cc: Heiko Schocher
    Cc: Albert ARIBAUD

    Christian Riesch
     

13 May, 2014

2 commits

  • 69c0d323e   kbuild: Fix trailing whitespaces ... Browse Code »

    Trivial fix.

    Signed-off-by: Michal Simek

    Michal Simek
     
  • 65bb6d8de   kbuild: build with -Werror=date-time if the compiler supports it ... Browse Code »

    Using __DATE__, __TIME__ would make the build non-deterministic.

    If the code needs to refer to build date/time, use U_BOOT_DATE and
    U_BOOT_TIME in include/generated/timestamp_autogenerated.h instead.

    This commit has been imported from Linux Kernel,
    which should be applied to U-Boot too:

    commit fe7c36c7bde12190341722af69358e42171162f3
    Author: Josh Triplett
    Date: Mon Dec 23 13:56:06 2013 -0800

    Makefile: Build with -Werror=date-time if the compiler supports it

    GCC 4.9 and newer have a new warning -Wdate-time, which warns on any use
    of __DATE__, __TIME__, or __TIMESTAMP__, which would make the build
    non-deterministic. Now that the kernel does not use any of those
    macros, turn on -Werror=date-time if available, to keep it that way.

    The kernel already (optionally) records this information at build time
    in a single place; other kernel code should not duplicate that.

    Signed-off-by: Josh Triplett
    Signed-off-by: Michal Marek
    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

12 May, 2014

1 commit

09 May, 2014

1 commit

26 Apr, 2014

1 commit

23 Apr, 2014

2 commits

  • 794d5f554   Revert "build: Use filechk rules to create and update u-boot.lds" ... Browse Code »

    This reverts commit a8b993eb81c142a439c24b871a2317f765fe5397.

    Commit a8b993eb claims it fixes u-boot.lds rule by replacing
    $(call if_changed) with $(call filechk).

    But the problem had already been fixed by commit 395e60cd
    a few days before commit a8b993eb was posted.

    There is no reason to apply commit a8b993eb. What is worse is
    $(call filechk) is too strong to fix the problem and looks weird.

    Date of the two patches:

    [1] commit 395e60cdc292dc0183c6867d34b43f14a373df55
    Author: Masahiro Yamada
    AuthorDate: Wed Apr 9 20:10:43 2014 +0900
    Commit: Tom Rini
    CommitDate: Fri Apr 11 10:08:42 2014 -0400
    replaces $(call if_changed) -> $(call if_changed_dep)

    [2] commit a8b993eb81c142a439c24b871a2317f765fe5397
    Author: Jon Loeliger
    AuthorDate: Tue Apr 15 16:09:37 2014 -0500
    Commit: Tom Rini
    CommitDate: Fri Apr 18 16:14:16 2014 -0400
    replaces $(call if_changed) -> $(call filechk)

    A conflict must have happened when applying [2], but somehow it was
    applied, sadly.

    Signed-off-by: Masahiro Yamada
    Cc: Jon Loeliger
    Cc: Andreas Bießmann
    Cc: Tom Rini

    Masahiro Yamada
     
  • 89ad7be8e   Makefile: Add support of CONFIG_SPL_FSL_PBL ... Browse Code »

    Objective of this target to have concatenate binary having
    - SPL binary in PBL command format
    - U-boot binary

    Signed-off-by: Prabhakar Kushwaha
    Reviewed-by: York Sun

    Prabhakar Kushwaha
     

22 Apr, 2014

1 commit

19 Apr, 2014

1 commit

  • a8b993eb8   build: Use filechk rules to create and update u-boot.lds ... Browse Code »
    230

    Prior to this patch, the top-level linker script u-boot.lds
    used a simple $(call if_changed) check when generated.
    That mechanism misses cases where a possible include file
    change induces a change in the u-boot.lds too.

    This patch converts it to a stronger check using ($call filechk)
    that will also notice differences in file contents and
    will catch changes due to pre-processing as well.

    Signed-off-by: Jon Loeliger

    Jon Loeliger
     

18 Apr, 2014

3 commits

  • 0e6256d07   kbuild: add user-supplied CPPFLAGS, AFLAGS and CFLAGS ... Browse Code »

    Like Linux Kernel, this commit provides environment variables
    KCPPFLAGS, KAFLAGS and KCFLAGS, which are useful to pass
    additional options.

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     
  • 598e2d338   kbuild: sync with Linux Kernel v3.15-rc1 ... Browse Code »
    46

    This commit imports Kbuild-related updates
    from v3.14 to v3.15-rc1.

    - commit 3d3d6b8474204b6819688c9800774d52d370a538
    kbuild: LLVMLinux: Adapt warnings for compilation with clang
    - commit 61163efae02040f66a95c8ed17f4407951ba58fa
    kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang
    - commit 79192ca8ebd9a25c583aa46024a250fef1e7766f
    scripts: objdiff: detect object code changes between two commits
    - commit 1c9e70a55b088d97a59241744fe459409d0c3582
    kbuild: create a build directory automatically for out-of-tree build
    - commit a03fcb50e816a69acffb13b5e56db75063aeba8a
    kbuild: remove redundant '.*.cmd' pattern from make distclean
    - commit 13338935f1574a2dcd1c891461b0dcc42f8cff42
    kbuild: move "quote" to Kbuild.include to be consistent
    - commit bfdfaeae500a3b194b73b01e92a8034791a58b7f
    kbuild: specify build_docproc as a phony target
    - commit f4d4ffc03efc864645b990e1d579bbe1b8e358a4
    kbuild: dtbs_install: new make target
    - commit 1e64ff42ea3d8d2fc8aa71f9717b3c1cb6c2f893
    Kbuild, lto: Disable LTO for asm-offsets.c
    - commit ccbef1674a1579842c7dbdf554efca85d2cd245a
    Kbuild, lto: add ld-version and ld-ifversion macros
    - commit ae63b2d7bdd9bd66b88843be0daf8e37d8f0b574
    scripts/tags.sh: Ignore *.mod.c
    - commit e36aaea28972c57a32a3ba5365e61633739719b9
    kbuild: Fix silent builds with make-4

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     
  • ef509b906   k2hk: add support for k2hk SOC and EVM ... Browse Code »
    34

    k2hk EVM is based on Texas Instruments Keystone2 Hawking/Kepler
    SoC. Keystone2 SoC has ARM v7 Cortex-A15 MPCore processor. Please
    refer the ti/k2hk_evm/README for details on the board, build and other
    information.

    This patch add support for keystone architecture and k2hk evm.

    Signed-off-by: Vitaly Andrianov
    Signed-off-by: Murali Karicheri
    Signed-off-by: WingMan Kwok
    Signed-off-by: Sandeep Nair

    Vitaly Andrianov
     

15 Apr, 2014

1 commit

11 Apr, 2014

1 commit

  • 395e60cdc   kbuild: fix a bug in regeneration of linker scripts ... Browse Code »
    92

    In some use cases, SPL linker script was not updated even when
    it should be.

    For instance,

    $ make tricoder_config all
    [ build complete ]
    ... modify include/configs/tricoder.h
    $ make

    spl/u-boot-spl.lds should be updated in this case, but it wasn't.

    To fix this problem, linker scripts generation should be handled
    by $(call if_changed_dep,...) rather than by $(call if_changed,...).

    Signed-off-by: Masahiro Yamada
    Reported-by: Andreas Bießmann
    Tested-by: Andreas Bießmann

    Masahiro Yamada
     

08 Apr, 2014

1 commit

04 Apr, 2014

3 commits

  • 1a9df13d5   arm: mxs: Add support for generating signed BootStream ... Browse Code »

    This patch adds the groundwork for generating signed BootStream, which
    can be used by the HAB library in i.MX28. We are adding a new target,
    u-boot-signed.sb , since the process for generating regular non-signed
    BootStream is much easier. Moreover, the signed bootstream depends on
    external _proprietary_ _binary-only_ tool from Freescale called 'cst',
    which is available only under NDA.

    To make things even uglier, the CST or HAB mandates a kind-of circular
    dependency. The problem is, unlike the regular IVT, which is generated
    by mxsimage, the IVT for signed boot must be generated by hand here due
    to special demands of the CST. The U-Boot binary (or SPL binary) and IVT
    are then signed by the CST as a one block. But here is the problem. The
    size of the entire image (U-Boot, IVT, CST blocks) must be appended at
    the end of IVT. But the size of the entire image is not known until the
    CST has finished signing the U-Boot and IVT. We solve this by expecting
    the CST block to be always 3904B (which it is in case two files, U-Boot
    and the hand-made IVT, are signed in the CST block).

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

    Marek Vasut
     
  • 1cad23c5f   Merge branch 'master' of git://git.denx.de/u-boot-arm into master ... Browse Code »

    Conflicts:
    arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
    arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

    Signed-off-by: Stefano Babic

    Stefano Babic
     
  • 5dd73bc0a   Revert "arm: mxs: Add support for generating signed BootStream" ... Browse Code »

    This reverts commit 53e6b14e037c9f72e6d03244c32d8d597e2e0234.

    Patch does not merge anymore with u-boot-arm and must be rebased.

    Signed-off-by: Stefano Babic

    Stefano Babic
     

02 Apr, 2014

1 commit

01 Apr, 2014

2 commits

  • c494eaf40   Prepare v2014.04-rc3 ... Browse Code »

    Signed-off-by: Tom Rini

    Tom Rini
     
  • 53e6b14e0   arm: mxs: Add support for generating signed BootStream ... Browse Code »
    56

    This patch adds the groundwork for generating signed BootStream, which
    can be used by the HAB library in i.MX28. We are adding a new target,
    u-boot-signed.sb , since the process for generating regular non-signed
    BootStream is much easier. Moreover, the signed bootstream depends on
    external _proprietary_ _binary-only_ tool from Freescale called 'cst',
    which is available only under NDA.

    To make things even uglier, the CST or HAB mandates a kind-of circular
    dependency. The problem is, unlike the regular IVT, which is generated
    by mxsimage, the IVT for signed boot must be generated by hand here due
    to special demands of the CST. The U-Boot binary (or SPL binary) and IVT
    are then signed by the CST as a one block. But here is the problem. The
    size of the entire image (U-Boot, IVT, CST blocks) must be appended at
    the end of IVT. But the size of the entire image is not known until the
    CST has finished signing the U-Boot and IVT. We solve this by expecting
    the CST block to be always 3904B (which it is in case two files, U-Boot
    and the hand-made IVT, are signed in the CST block).

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

    Marek Vasut
     

31 Mar, 2014

1 commit

  • 4642e0022   Kbuild: allow building tools without board configuration ... Browse Code »

    Prior to Kbuild, U-Boot could build under tools/ directory
    withour configuring for a specific board.

    That feature was lost when switching to Kbuild.

    This patch revives it again by adding a make target "tools-only".

    Usage:
    $ make tools-only

    Neither board configuration nor cross compiler are required to
    build host tools.

    Signed-off-by: Masahiro Yamada
    Suggested-by: Alexey Brodkin
    Cc: Simon Glass
    Cc: Tom Rini
    Acked-by: Alexey Brodkin

    Masahiro Yamada
     

29 Mar, 2014

3 commits

  • 6bd04bb48   kbuild: fix bugs in cleaning targets ... Browse Code »

    "make clean", "make clobber", "make mrproper" and "make distclean"
    missed to clean-up some files when they were run with
    O= option.

    Signed-off-by: Masahiro Yamada
    Reported-by: Wolfgang Denk

    Masahiro Yamada
     
  • 5a449d75b   kbuild: create a build directory automatically for out-of-tree build ... Browse Code »

    Prior to Kbuild, the build system created a build directory,
    when it did not exist, for out-of-tree build.

    This feature was dropped when we switched to Kbuild
    because many of lines in makefiles were copied from Linux Kernel.
    (In Linux Kernel, we have to create a build directory by ourselves
    before starting build.)

    That feature seems worth reviving for less typing
    even if our code and Linux Kernel diverge.

    Signed-off-by: Masahiro Yamada
    Suggested-by: Simon Glass
    Acked-by: Simon Glass
    Tested-by: Simon Glass

    Masahiro Yamada
     
  • b97241b31   kbuild: Rename UIMAGE to MKIMAGE ... Browse Code »

    U-Boot uses the 'mkimage' tool to produce various image types,
    not only uImage image type. Rename the invocation name from
    UIMAGE to MKIMAGE.

    The following command was used to do the replacement:
    git grep 'quiet_cmd_mkimage.* = UIMAGE' | cut -d : -f 1 | \
    xargs -i sed -i "s@\(quiet_cmd_mkimage\)\(.*\) = UIMAGE @\1\2 = MKIMAGE@" {}

    Signed-off-by: Marek Vasut
    Cc: Tom Rini
    Cc: Masahiro Yamada
    Acked-by: Masahiro Yamada

    Marek Vasut
     

13 Mar, 2014

8 commits