Eric Lee / smarc-uboot

23 Jan, 2020

1 commit

  • c82216803   env: another attempt at fixing SPL build failures ... Browse Code »

    I'm also seeing the build failure that commit

    7d4776545b env: solve compilation error in SPL

    tried to fix, namely that the reference to env_flags_validate from
    env_htab cannot be satisfied when flags.o is not built in. However,
    that commit got reverted by

    d90fc9c3de Revert "env: solve compilation error in SPL"

    Necessary, but not sufficient conditions to see this are

    CONFIG_SPL=y (obviously)
    CONFIG_SPL_ENV_SUPPORT=n (so flags.o does not get compiled)
    CONFIG_SPL_LIBCOMMON_SUPPORT=y (so env/built-in.o is part of the SPL link)

    Now, these are satisfied for e.g. imx6q_logic_defconfig. But that
    builds just fine, and spl/u-boot-spl.map lists .data.env_htab among
    the discarded (garbage collected) sections. Yet, on our
    mpc8309-derived board, we do see the build failure, so perhaps the
    linker works a bit differently on ppc than on ARM, or there's yet some
    other configuration option needed to observe the break.

    This is another attempt at solving it, which also cleans up
    env/Makefile a bit: Introduce a def_bool y symbol CONFIG_ENV_SUPPORT
    which complements CONFIG_(SPL/TPL)_SUPPORT. Then use
    CONFIG_$(SPL_TPL_)ENV_SUPPORT to decide whether to include the five
    basic env/*.o files. For attr.o, flags.o and callback.o, this
    shouldn't change anything. Also, common.o and env.o still get
    unconditionally built for U-boot proper. But for TPL/SPL, those two
    are only included if CONFIG_(SPL/TPL)_SUPPORT is set.

    Having that symbol should also allow simplifying conditionals such as

    #if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(ENV_SUPPORT)

    found in drivers/reset/reset-socfpga.c to just
    CONFIG_IS_ENABLED(ENV_SUPPORT).

    Signed-off-by: Rasmus Villemoes

    Rasmus Villemoes
     

22 Jul, 2018

1 commit

07 May, 2018

1 commit

  • 83d290c56   SPDX: Convert all of our single license tags to Linux Kernel style ... Browse Code »
    56

    When U-Boot started using SPDX tags we were among the early adopters and
    there weren't a lot of other examples to borrow from. So we picked the
    area of the file that usually had a full license text and replaced it
    with an appropriate SPDX-License-Identifier: entry. Since then, the
    Linux Kernel has adopted SPDX tags and they place it as the very first
    line in a file (except where shebangs are used, then it's second line)
    and with slightly different comment styles than us.

    In part due to community overlap, in part due to better tag visibility
    and in part for other minor reasons, switch over to that style.

    This commit changes all instances where we have a single declared
    license in the tag as both the before and after are identical in tag
    contents. There's also a few places where I found we did not have a tag
    and have introduced one.

    Signed-off-by: Tom Rini

    Tom Rini
     

16 Oct, 2017

1 commit

16 Aug, 2017

1 commit

15 Aug, 2017

1 commit