1. 24 Feb, 2015 4 commits
    • 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: default avatarSimon Glass <sjg@chromium.org>
      e02ee254
    • Simon Glass's avatar
      kconfig: Adjust ordering so that defaults work as expected · 66afaef2
      Simon Glass authored
      At present defaults in arch-specific Kconfig files are ignored if the
      top-level item comes ahead of it in include order. This means that it is
      not possible to have a U-Boot default that architectures and boards can
      override. This does not seem very useful.
      
      Move the include earlier to support this.
      Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
      Reported-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Reviewed-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      66afaef2
    • Masahiro Yamada's avatar
      ARM: UniPhier: set CONFIG_SYS_MALLOC_F to the global default value · 6d4d05b1
      Masahiro Yamada authored
      It is true that malloc is necessary for Driver Model before
      relocation, but there is no good reason to reserve the malloc
      space more than enough.  The default value 0x400 works well.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
      6d4d05b1
    • Enric Balletbo i Serra's avatar
      OMAP3: igep0032: Fix regression due commit f3b4bc45. · 50bb94c9
      Enric Balletbo i Serra authored
      Commit referenced in subject breaks IGEP0032 build with the following
      error:
      
        drivers/misc/status_led.c:30:7: error: 'RED_LED_GPIO' undeclared here (not in a function)
        scripts/Makefile.build:275: recipe for target 'drivers/misc/status_led.o' failed
        make[2]: *** [drivers/misc/status_led.o] Error 1
        scripts/Makefile.build:420: recipe for target 'drivers/misc' failed
        make[1]: *** [drivers/misc] Error 2
        Makefile:1093: recipe for target 'drivers' failed
        make: *** [drivers] Error 2
      
      Fix this by skipping the status led on IGEP0032 machine as is not available
      and throw an error for future machines if the status led is not configured
      to avoid build breakage.
      Reported-by: default avatarAlbert ARIBAUD <albert.u.boot@aribaud.net>
      Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
      50bb94c9
  2. 23 Feb, 2015 9 commits
  3. 22 Feb, 2015 1 commit
  4. 21 Feb, 2015 26 commits