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:
      
      SPIFLASH
      DISPLAY_BOARDINFO
      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>
      c9bb942e
  2. 05 Jun, 2015 1 commit
  3. 01 Jun, 2015 2 commits
  4. 12 May, 2015 1 commit
  5. 04 May, 2015 2 commits
  6. 18 Apr, 2015 1 commit
  7. 15 Mar, 2015 1 commit
  8. 02 Feb, 2015 1 commit
  9. 23 Jan, 2015 1 commit
  10. 14 Jan, 2015 1 commit
  11. 05 Nov, 2014 3 commits
    • Ian Campbell's avatar
      sunxi: kconfig: Introduce CONFIG_TARGET_<BOARD> · d9a20476
      Ian Campbell authored
      This was done automatically with the following bits of scripting.
      
      The Kconfig choice content was generated with this script snippet:
          for i in $(git grep -l CONFIG_ARCH_SUNXI configs/*) ; do
              TARGET=$(sed -n -e 's/CONFIG_SYS_EXTRA_OPTIONS="\([^,"]\+\).*/\1/p' $i);
              MACH=$(sed -n -e 's/.*CONFIG_\(MACH_SUN.I\)=./\1/p' $i)
              echo "config TARGET_$TARGET"
              echo "	bool \"$TARGET\""
              echo "	depends on $MACH"
              echo
          done
      
      defconfigs were updated with a sed script (t):
          # Extract board from first entry of CONFIG_SYS_EXTRA_OPTIONS,
          /^CONFIG_SYS_EXTRA_OPTIONS/ {
              s/^\(CONFIG_SYS_EXTRA_OPTIONS="\)\([^,"]\+\),\?\(.*\)/\1\3\nCONFIG_TARGET_\2=y/;
      
              # Print and delete first line (CONFIG_SYS_EXTRA_OPTIONS), leaving
              # CONFIG_TARGET_<BOARD> in pattern space
              P;D;
          };
      
          # Move CONFIG_TARGET_<BOARD> to hold space
          /^CONFIG_TARGET/{h;n}
      
          # Print CONFIG_TARGET_<BOARD> after CONFIG_MACH_<SOC> in either SPL or
          # normal mode.
          /^CONFIG_MACH/{p;g;p;n};
          /^\+S:CONFIG_MACH/{p;g;s/^CONFIG_TARGET/+S:&/;p;n};
      
          # Print any remaining lines normally
          p;
      Run as:
          sed -i -n -f t $(git grep -l CONFIG_ARCH_SUNXI configs/*)
      and then manually removing the one instance of CONFIG_SYS_EXTRA_OPTIONS="" from
      Colombus_defconfig
      
      board/sunxi/Makefile was updated with:
          sed -e 's/^\(obj-\$(CONFIG_\)\(.*\)\().*+= dram_.*\)/\1TARGET_\2\3/g' board/sunxi/Makefile
      and manually retabbing a few lines to line up again.
      
      The board descriptions could certainly be improved.
      Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
      Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      d9a20476
    • Ian Campbell's avatar
      sunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I. · c3be2793
      Ian Campbell authored
      Now we have CONFIG_ARCH_SUNXI as the toplevel, CONFIG_MACH_SUN[45678]I as the
      per-SoC option and leave CONFIG_TARGET_BLAH free for individual boards in the
      future.
      
      Done automatically with:
          sed -i -e 's/TARGET_\(SUN[45678]I\)/MACH_\1/g' $(git grep -l TARGET_SUN[45678]I)
      Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
      Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      c3be2793
    • Ian Campbell's avatar
      sunxi: kconfig: Add top-level ARCH_SUNXI · 2c7e3b90
      Ian Campbell authored
      And make TARGET_SUN[45678]I a choice variable under this.
      
      configs updated with:
          sed -i -e 's/^\(\+S:\)\?CONFIG_TARGET_SUN.I=y/\1CONFIG_ARCH_SUNXI=y\n&/g' configs/*
      Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
      Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      2c7e3b90
  12. 24 Oct, 2014 1 commit
    • Hans de Goede's avatar
      sunxi: Enable second sdcard slot found on some boards · 69c050a6
      Hans de Goede authored
      Enable the second sdcard slot found on some boards. Note that we do not
      set CONFIG_MMC_SUNXI_SLOT_EXTRA for the SPL, as having it there is not useful,
      
      Except for on the Mele-M3 where the second sdcard is an eMMC, from which the
      device can also boot, and there we want to have both in the SPL, so that
      a single u-boot binary can both from both. So for the M3 we do prefix the
      defconfig setting with the special "+S:" syntax so that it applies to the
      SPL too.
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Acked-by: default avatarIan Campbell <ijc@hellion.org.uk>
      69c050a6
  13. 05 Sep, 2014 2 commits
  14. 12 Aug, 2014 1 commit
  15. 31 Jul, 2014 4 commits
  16. 30 Jul, 2014 1 commit
    • Masahiro Yamada's avatar
      kconfig: add board Kconfig and defconfig files · dd84058d
      Masahiro Yamada authored
      This commit adds:
       - arch/${ARCH}/Kconfig
          provide a menu to select target boards
       - board/${VENDOR}/${BOARD}/Kconfig or board/${BOARD}/Kconfig
          set CONFIG macros to the appropriate values for each board
       - configs/${TARGET_BOARD}_defconfig
          default setting of each board
      
      (This commit was automatically generated by a conversion script
      based on boards.cfg)
      
      In Linux Kernel, defconfig files are located under
      arch/${ARCH}/configs/ directory.
      It works in Linux Kernel since ARCH is always given from the
      command line for cross compile.
      
      But in U-Boot, ARCH is not given from the command line.
      Which means we cannot know ARCH until the board configuration is done.
      That is why all the "*_defconfig" files should be gathered into a
      single directory ./configs/.
      Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
      Acked-by: default avatarSimon Glass <sjg@chromium.org>
      dd84058d