1. 26 Jun, 2015 1 commit
    • Joe Hershberger's avatar
      Move default y configs out of arch/board Kconfig · c9bb942e
      Joe Hershberger authored
      Some archs/boards specify their own default by pre-defining the config
      which causes the Kconfig system to mix up the order of the configs in
      the defconfigs... This will cause merge pain if allowed to proliferate.
      Remove the configs that behave this way from the archs.
      A few configs still remain, but that is because they only exist as
      defaults and do not have a proper Kconfig entry. Those appear to be:
      Signed-off-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
      [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates,
      drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM]
      Signed-off-by: default avatarTom Rini <trini@konsulko.com>
  2. 11 Jun, 2015 2 commits
  3. 12 May, 2015 1 commit
  4. 18 Apr, 2015 1 commit
    • Masahiro Yamada's avatar
      dm: select CONFIG_DM* options · 58d423b8
      Masahiro Yamada authored
      As mentioned in the previous commit, adding default values in each
      Kconfig causes problems because it does not co-exist with the
      "depends on" syntax.  (Please note this is not a bug of Kconfig.)
      We should not do so unless we have a special reason.  Actually,
      for CONFIG_DM*, we have no good reason to do so.
      Generally, CONFIG_DM is not a user-configurable option.  Once we
      convert a driver into Driver Model, the board only works with Driver
      Model, i.e. CONFIG_DM must be always enabled for that board.
      So, using "select DM" is more suitable rather than allowing users to
      modify it.  Another good thing is, Kconfig warns unmet dependencies
      for "select" syntax, so we easily notice bugs.
      Actually, CONFIG_DM and other related options have been added
      without consistency: some into arch/*/Kconfig, some into
      board/*/Kconfig, and some into configs/*_defconfig.
      This commit prefers "select" and cleans up the following issues.
      [1] Never use "CONFIG_DM=n" in defconfig files
      It is really rare to add "CONFIG_FOO=n" to disable CONFIG options.
      It is more common to use "# CONFIG_FOO is not set".  But here, we
      do not even have to do it.
      Less than half of OMAP3 boards have been converted to Driver Model.
      Adding the default values to arch/arm/cpu/armv7/omap3/Kconfig is
      weird.  Instead, add "select DM" only to appropriate boards, which
      eventually eliminates "CONFIG_DM=n", etc.
      [2] Delete redundant CONFIGs
      Sandbox sets CONFIG_DM in arch/sandbox/Kconfig and defines it again
      in configs/sandbox_defconfig.
      Likewise, OMAP3 sets CONFIG_DM arch/arm/cpu/armv7/omap3/Kconfig and
      defines it also in omap3_beagle_defconfig and devkit8000_defconfig.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
  5. 28 Mar, 2015 1 commit
  6. 04 Mar, 2015 1 commit
  7. 24 Feb, 2015 2 commits
    • Masahiro Yamada's avatar
      kconfig: remove unneeded dependency on !SPL_BUILD · d648964f
      Masahiro Yamada authored
      Now CONFIG_SPL_BUILD is not defined in Kconfig, so
      "!depends on SPL_BUILD" and "if !SPL_BUILD" are redundant.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
    • 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
      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: default avatarSimon Glass <sjg@chromium.org>
  8. 21 Feb, 2015 1 commit
    • Masahiro Yamada's avatar
      ARM: tegra: collect SoC sources into mach-tegra · 09f455dc
      Masahiro Yamada authored
      This commit moves files as follows:
       arch/arm/cpu/arm720t/tegra20/*      -> arch/arm/mach-tegra/tegra20/*
       arch/arm/cpu/arm720t/tegra30/*      -> arch/arm/mach-tegra/tegra30/*
       arch/arm/cpu/arm720t/tegra114/*     -> arch/arm/mach-tegra/tegra114/*
       arch/arm/cpu/arm720t/tegra124*      -> arch/arm/mach-tegra/tegra124/*
       arch/arm/cpu/arm720t/tegra-common/* -> arch/arm/mach-tegra/*
       arch/arm/cpu/armv7/tegra20/*        -> arch/arm/mach-tegra/tegra20/*
       arch/arm/cpu/armv7/tegra30/*        -> arch/arm/mach-tegra/tegra30/*
       arch/arm/cpu/armv7/tegra114/*       -> arch/arm/mach-tegra/tegra114/*
       arch/arm/cpu/armv7/tegra124/*       -> arch/arm/mach-tegra/tegra124/*
       arch/arm/cpu/armv7/tegra-common/*   -> arch/arm/mach-tegra/*
       arch/arm/cpu/tegra20-common/*       -> arch/arm/mach-tegra/tegra20/*
       arch/arm/cpu/tegra30-common/*       -> arch/arm/mach-tegra/tegra30/*
       arch/arm/cpu/tegra114-common/*      -> arch/arm/mach-tegra/tegra114/*
       arch/arm/cpu/tegra124-common/*      -> arch/arm/mach-tegra/tegra124/*
       arch/arm/cpu/tegra-common/*         -> arch/arm/mach-tegra/*
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Tested-by: Simon Glass <sjg@chromium.org> [ on nyan-big ]
      Cc: Stephen Warren <swarren@nvidia.com>
      Cc: Tom Warren <twarren@nvidia.com>
  9. 12 Feb, 2015 2 commits
  10. 13 Nov, 2014 1 commit
  11. 23 Oct, 2014 1 commit
  12. 13 Sep, 2014 1 commit
  13. 31 Aug, 2014 1 commit