1. 07 May, 2018 1 commit
    • Tom Rini's avatar
      SPDX: Convert all of our single license tags to Linux Kernel style · 83d290c5
      Tom Rini authored
      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's avatarTom Rini <trini@konsulko.com>
      83d290c5
  2. 28 Jan, 2017 1 commit
  3. 07 Oct, 2016 2 commits
    • Masahiro Yamada's avatar
      kbuild: generate u-boot.cfg as a byproduct of include/autoconf.mk · e19b0fb4
      Masahiro Yamada authored
      Our build system still parses ad-hoc CONFIG options in header files
      and generates include/autoconf.mk so that Makefiles can reference
      them.  This gimmick was introduced in the pre-Kconfig days and will
      be kept until Kconfig migration is completed.
      
      The include/autoconf.mk is generated like follows:
      
        [1] Preprocess include/common.h with -DDO_DEPS_ONLY and
            retrieve macros into include/autoconf.mk.tmp
        [2] Reformat include/autoconf.mk.dep into include/autoconf.mk
            with tools/scripts/define2mk.sed script
        [3] Remove include/autoconf.mk.tmp
      
      Here, include/autoconf.mk.tmp is similar to u-boot.cfg, which is
      also generated by preprocessing include/config.h with -DDO_DEPS_ONLY.
      In other words, there is much overlap among include/autoconf.mk and
      u-boot.cfg build rules.
      
      So, the idea is to split the build rule of include/autoconf.mk
      into two stages.  The first preprocesses headers into u-boot.cfg.
      The second parses the u-boot.cfg into include/autoconf.mk.  The
      build rules of u-boot.cfg in Makefile and spl/Makefile will be gone.
      Signed-off-by: Masahiro Yamada's avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Reviewed-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
      e19b0fb4
    • Masahiro Yamada's avatar
      kbuild: make dependencies in scripts/Makefile.autoconf more readable · 1406992f
      Masahiro Yamada authored
      I do not remember why I wrote the code like this, but let's make it
      a bit more readable.
      Signed-off-by: Masahiro Yamada's avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Reviewed-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
      1406992f
  4. 19 Jan, 2016 1 commit
  5. 27 Jul, 2015 1 commit
  6. 26 May, 2015 1 commit
    • Joe Hershberger's avatar
      moveconfig: Ignore duplicate configs when moving · 7740f653
      Joe Hershberger authored
      When moving configs, it is important to know what was defined in the
      config header even if it duplicates the configs coming from Kconfig.
      
      This is specifically needed for the case where a config is set to
      default 'y' in the Kconfig. This would previously cause the actual value
      from the include config to be filtered out, and moveconfig.py would
      think that it was 'n'... This means that the value that should be 'y'
      is now (in every defconfig) set to 'not set'.
      
      tools/moveconfig.py now defines KCONFIG_IGNORE_DUPLICATES to prevent the
      filtering from happening and selecting wrong values for the defconfig.
      Signed-off-by: Joe Hershberger's avatarJoe Hershberger <joe.hershberger@ni.com>
      Acked-by: Masahiro Yamada's avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      7740f653
  7. 24 Feb, 2015 1 commit
    • Masahiro Yamada's avatar
      kconfig: switch to single .config configuration · e02ee254
      Masahiro Yamada authored
      When Kconfig for U-boot was examined, one of the biggest issues was
      how to support multiple images (Normal, SPL, TPL).  There were
      actually two options, "single .config" and "multiple .config".
      After some discussions and thought experiments, I chose the latter,
      i.e. to create ".config", "spl/.config", "tpl/.config" for Normal,
      SPL, TPL, respectively.
      
      It is true that the "multiple .config" strategy provided us the
      maximum flexibility and helped to avoid duplicating CONFIGs among
      Normal, SPL, TPL, but I have noticed some fatal problems:
      
      [1] It is impossible to share CONFIG options across the images.
        If you change the configuration of Main image, you often have to
        adjust some SPL configurations correspondingly.  Currently, we
        cannot handle the dependencies between them.  It means one of the
        biggest advantages of Kconfig is lost.
      
      [2] It is too painful to change both ".config" and "spl/.config".
        Sunxi guys started to work around this problem by creating a new
        configuration target.  Commit cbdd9a97 (sunxi: kconfig: Add
        %_felconfig rule to enable FEL build of sunxi platforms.) added
        "make *_felconfig" to enable CONFIG_SPL_FEL on both images.
        Changing the configuration of multiple images in one command is a
        generic demand.  The current implementation cannot propose any
        good solution about this.
      
      [3] Kconfig files are getting ugly and difficult to understand.
        Commit b724bd7d (dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to
        Kconfig) has sprinkled "if !SPL_BUILD" over the Kconfig files.
      
      [4] The build system got more complicated than it should be.
        To adjust Linux-originated Kconfig to U-Boot, the helper script
        "scripts/multiconfig.sh" was introduced.  Writing a complicated
        text processor is a shell script sometimes caused problems.
      
      Now I believe the "single .config" will serve us better.  With it,
      all the problems above would go away.  Instead, we will have to add
      some CONFIG_SPL_* (and CONFIG_TPL_*) options such as CONFIG_SPL_DM,
      but we will not have much.  Anyway, this is what we do now in
      scripts/Makefile.spl.
      
      I admit my mistake with my apology and this commit switches to the
      single .config configuration.
      
      It is not so difficult to do that:
      
       - Remove unnecessary processings from scripts/multiconfig.sh
        This file will remain for a while to support the current defconfig
        format.  It will be removed after more cleanups are done.
      
       - Adjust some makefiles and Kconfigs
      
       - Add some entries to include/config_uncmd_spl.h and the new file
         scripts/Makefile.uncmd_spl.  Some CONFIG options that are not
         supported on SPL must be disabled because one .config is shared
         between SPL and U-Boot proper going forward.  I know this is not
         a beautiful solution and I think we can do better, but let's see
         how much we will have to describe them.
      
       - update doc/README.kconfig
      
      More cleaning up patches will follow this.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Reviewed-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
      e02ee254
  8. 21 Feb, 2015 1 commit
    • Masahiro Yamada's avatar
      kbuild: prepare for moving headers into mach-*/include/mach · 0e7368c6
      Masahiro Yamada authored
      In U-Boot, SoC-specific headers are placed in
      arch/$(ARCH)/include/asm/arch-$(SOC) and a symbolic link to that
      directory is created at the early stage of the build process.
      
      Creating and removing a symbolic link during the build is not
      preferred.  In fact, Linux Kernel did away with include/asm-$(ARCH)
      directories a long time time ago.
      
      As for ARM, now it is possible to collect SoC sources into
      arch/arm/mach-$(SOC).  It is also reasonable to move SoC headers
      into arch/arm/mach-$(SOC)/include/mach.
      
      This commit prepares for that.
      If the directory arch/$(ARCH)/mach-$(SOC)/include/mach exists,
      a symbolic to that directory is created.  Otherwise, a symbolic link
      to arch/$(ARCH)/include/asm/arch-$(SOC) or arch-$(CPU) is created.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      0e7368c6
  9. 07 Nov, 2014 1 commit
    • Masahiro Yamada's avatar
      kbuild: sync top Makefile with Linux 3.18-rc1 · ffe29ebc
      Masahiro Yamada authored
      Since Linux 3.15, relative path feature and related fixes,
      cleanups have been merged to the top Makefile.
      
      The relative path feature looks stable enough, so let's import it
      to U-Boot along with various cleanups.
      
      Commits imported from Linux (some need adjustment) are:
      
      [1] commit 7e1c04779efd by Michal Marek
        kbuild: Use relative path for $(objtree)
      
      [2] commit 890676c65d69 by Michal Marek
        kbuild: Use relative path when building in the source tree
      
      [3] commit 9da0763bdd82 by Michal Marek
        kbuild: Use relative path when building in a subdir of the source tree
      
      [4] commit c2e28dc975ea by Michal Marek
        kbuild: Print the name of the build directory
      
      [5] commit 066b7ed95580 by Michal Marek
        kbuild: Do not print the build directory with make -s
      
      [6] commit 3f1d9a6cec01 by Michal Marek
        kbuild: make -s should be used with kernelrelease/kernelversion/image_name
      
      [7] commit 7ff525712acf by Masahiro Yamada
        kbuild: fake the "Entering directory ..." message more simply
      
      [8] commit 745a254322c8 by Masahiro Yamada
        kbuild: use $(Q) for sub-make target
      
      [9] commit aa55c8e2f7a3 by Masahiro Yamada
        kbuild: handle C=... and M=... after entering into build directory
      
      [10] commit ab7474ea5361 by Borislav Petkov
        Kbuild: Ignore GREP_OPTIONS env variable
      
      To use relative path feature, tools/Makefile and scripts/Makefile.autoconf
      must be tweaked.
      Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
      Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      ffe29ebc
  10. 24 Sep, 2014 1 commit
  11. 30 Jul, 2014 1 commit
    • Masahiro Yamada's avatar
      kconfig: switch to Kconfig · 51148790
      Masahiro Yamada authored
      This commit enables Kconfig.
      Going forward, we use Kconfig for the board configuration.
      mkconfig will never be used. Nor will include/config.mk be generated.
      
      Kconfig must be adjusted for U-Boot because our situation is
      a little more complicated than Linux Kernel.
      We have to generate multiple boot images (Normal, SPL, TPL)
      from one source tree.
      Each image needs its own configuration input.
      
      Usage:
      
      Run "make <board>_defconfig" to do the board configuration.
      
      It will create the .config file and additionally spl/.config, tpl/.config
      if SPL, TPL is enabled, respectively.
      
      You can use "make config", "make menuconfig" etc. to create
      a new .config or modify the existing one.
      
      Use "make spl/config", "make spl/menuconfig" etc. for spl/.config
      and do likewise for tpl/.config file.
      
      The generic syntax of configuration targets for SPL, TPL is:
      
        <target_image>/<config_command>
      
      Here, <target_image> is either 'spl' or 'tpl'
            <config_command> is 'config', 'menuconfig', 'xconfig', etc.
      
      When the configuration is done, run "make".
      (Or "make <board>_defconfig all" will do the configuration and build
      in one time.)
      
      For futher information of how Kconfig works in U-Boot,
      please read the comment block of scripts/multiconfig.py.
      
      By the way, there is another item worth remarking here:
      coexistence of Kconfig and board herder files.
      
      Prior to Kconfig, we used C headers to define a set of configs.
      
      We expect a very long term to migrate from C headers to Kconfig.
      Two different infractructure must coexist in the interim.
      
      In our former configuration scheme, include/autoconf.mk was generated
      for use in makefiles.
      It is still generated under include/, spl/include/, tpl/include/ directory
      for the Normal, SPL, TPL image, respectively.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
      51148790