11 Feb, 2018

1 commit

  • On the NIOS2 and Xtensa architectures, we do not have
    CONFIG_SYS_TEXT_BASE set. This is a strict migration of the current
    values into the defconfig and removing them from the headers.

    I did not attempt to add more default values in and for now will leave
    that to maintainers.

    Signed-off-by: Tom Rini

    Tom Rini
     

06 Feb, 2018

1 commit

  • cmd/Makefile has:

    ifdef CONFIG_FPGA
    obj-$(CONFIG_CMD_FPGA) += fpga.o
    endif

    which means that if CONFIG_FPGA is not set, CONFIG_CMD_FPGA silently
    does nothing. Let's remove that Makefile conditional and instead express
    this equivalent dependency in Kconfig, so a lot of redundant

    # CONFIG_CMD_FPGA is not set

    can be removed from board defconfigs that don't actually have an FPGA.

    Signed-off-by: Tuomas Tynkkynen

    Tuomas Tynkkynen
     

11 Oct, 2017

1 commit

  • Having this as a 'default y' is rather annoying because it doesn't
    actually compile unless other options are defined in the board header:

    ../cmd/bootm.c: In function 'do_imls_nor':
    ../cmd/bootm.c:330:7: error: 'CONFIG_SYS_MAX_FLASH_BANKS' undeclared (first use in this function); did you mean 'CONFIG_SYS_MAX_FLASH_SECT'?
    i < CONFIG_SYS_MAX_FLASH_BANKS; ++i, ++info) {

    Make it 'default n' so people who develop new boards that start from a
    blank defconfig have one less compilation failure to debug.

    Signed-off-by: Tuomas Tynkkynen

    Tuomas Tynkkynen
     

02 Sep, 2017

1 commit

  • This syncs all of the currently Kconfig'd symbols out of the headers and
    into the defconfig files. This has two exceptions, first am335x_evm
    needs to be converted to DM in SPL and then it can stop undef'ing
    CONFIG_DM_USB. Leaving this as-is results in a build failure, and
    without work, run time failure. The other case is am43xx_evm.h and in
    turn am43xx_evm_usbhost_boot. The problem here is that we need DWC3 USB
    host mode in SPL, but still desire to have gadget mode in U-Boot proper.

    Signed-off-by: Tom Rini

    Tom Rini
     

20 Apr, 2017

2 commits


14 Mar, 2017

1 commit


28 Jan, 2017

3 commits


17 Sep, 2016

2 commits


25 May, 2016

1 commit

  • Recently a set of CONFIG_CMD_FOO defines was moved from being defined
    in config_distro_defaults to Kconfig, and added to all sunxi defconfigs
    to compensate.

    Instead of explictly selecting these in all sunxi defconfigs,
    simply always select these for sunxi boards. This makes the defconfigs
    simpler and ensures a consistent set of available commands across all
    sunxi boards.

    Signed-off-by: Hans de Goede

    Hans de Goede
     

26 Apr, 2016

3 commits


12 Apr, 2016

1 commit

  • We have CONFIG_CMD_GPIO=y in almost all sunxi boards, but after
    its Kconfig conversion it has ended up missing on some recently
    added boards.

    Simply select it for ARCH_SUNXI, so that we get it on all
    sunxi boards for both a consistent user experience and simpler
    defconfig files.

    Signed-off-by: Hans de Goede
    Acked-by: Ian Campbell

    Hans de Goede
     

24 Mar, 2016

1 commit

  • Always select OF_BOARD_SETUP on sunxi, rather then having it in almost
    all our defconfigs. This also fixes it missing from some recently
    added defconfigs.

    This commit also modifies our ft_board_setup() to not cause warnings
    when CONFIG_VIDEO_DT_SIMPLEFB is not set, since we will now always
    build it.

    Signed-off-by: Hans de Goede
    Acked-by: Ian Campbell

    Hans de Goede
     

15 Mar, 2016

1 commit

  • There are already two FIT options in Kconfig but the CONFIG options are
    still in the header files. We need to do a proper move to fix this.

    Move these options to Kconfig and tidy up board configuration:

    CONFIG_FIT
    CONFIG_OF_BOARD_SETUP
    CONFIG_OF_SYSTEM_SETUP
    CONFIG_FIT_SIGNATURE
    CONFIG_FIT_BEST_MATCH
    CONFIG_FIT_VERBOSE
    CONFIG_OF_STDOUT_VIA_ALIAS
    CONFIG_RSA

    Unfortunately the first one is a little complicated. We need to make sure
    this option is not enabled in SPL by this change. Also this option is
    enabled automatically in the host builds by defining CONFIG_FIT in the
    image.h file. To solve this, add a new IMAGE_USE_FIT #define which can
    be used in files that are built on the host but must also build for U-Boot
    and SPL.

    Note: Masahiro's moveconfig.py script is amazing.

    Signed-off-by: Simon Glass
    [trini: Add microblaze change, various configs/ re-applies]
    Signed-off-by: Tom Rini

    Simon Glass
     

10 Dec, 2015

1 commit


22 Nov, 2015

1 commit


19 Nov, 2015

1 commit


21 Oct, 2015

1 commit

  • Kconfig-ify CONFIG_AXP152_POWER and _AXP209_POWER settings, removing
    them from CONFIG_SYS_EXTRA_OPTIONS.

    Note that sun5i boards can have either an AXP209 or an AXP152 pmic, the
    Kconfig default is AXP209, boards with an AXP152 must explicitly select
    this. Likewise boards without a pmic must explicitly select SUNXI_NO_PMIC
    in their defconfig.

    Signed-off-by: Hans de Goede
    Acked-by: Ian Campbell

    Hans de Goede
     

14 Aug, 2015

1 commit


25 Jul, 2015

1 commit

  • With certain features being convert to DM now we want sunxi to default
    to having DM enabled for ETH/SERIAL and USB in some cases.

    Cc: Hans de Goede
    Cc: Ian Campbell
    Signed-off-by: Tom Rini
    [hdegoede@redhat.com: Also select CONFIG_USB for all sunxi builds]
    Signed-off-by: Hans de Goede
    Acked-by: Ian Campbell
    Reviewed-by: Simon Glass

    Tom Rini
     

26 Jun, 2015

2 commits

  • This sets the default commands Kconfig to match
    include/config_cmd_default.h commands in the common/Kconfig and removes
    them from include/configs.

    Signed-off-by: Joe Hershberger
    [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates]
    Signed-off-by: Tom Rini

    Joe Hershberger
     
  • 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: Joe Hershberger
    [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: Tom Rini

    Joe Hershberger
     

06 Jun, 2015

1 commit


01 Jun, 2015

2 commits


13 May, 2015

1 commit

  • In order to reduce merge conflicts and to maintain the simplest possible
    defconfig files, we should be using the savedefconfig feature of Kconfig
    every time a new feature is added. This keeps the defconfig settings to
    a minimum (only those things not default) and keeps them in the same
    order as the Kconfig options.

    Signed-off-by: Joe Hershberger
    Cc: Masahiro Yamada
    Acked-by: Stephen Warren
    Cc: Tom Rini

    Joe Hershberger
     

04 May, 2015

2 commits

  • Now that we've everything prepared for it remove the DM settings from the
    defconfig(s) and simply always set them for sunxi.

    This makes all sunxi boards allways use the driver model for gpios and
    ethernet, and allows us to move over more bits to the driver-model without
    the need to introduce #ifdef-ery for boards which are not yet using DM.

    Signed-off-by: Hans de Goede
    Reviewed-by: Simon Glass
    Acked-by: Ian Campbell

    Hans de Goede
     
  • This is a preparation patch for switching all sunxi boards over to using
    the driver model.

    Note that rather then defining both CONFIG_DEFAULT_DEVICE_TREE (for u-boot)
    and CONFIG_FDTFILE (for the kernel), this commit simply replaces all
    CONFIG_FDTFILE defconfig settings with CONFIG_DEFAULT_DEVICE_TREE and
    uses CONFIG_DEFAULT_DEVICE_TREE for setting the default fdtfile env value
    in sunxi-common.h .

    Signed-off-by: Hans de Goede
    Reviewed-by: Simon Glass
    Acked-by: Ian Campbell

    Hans de Goede
     

19 Apr, 2015

1 commit


16 Mar, 2015

1 commit


02 Feb, 2015

1 commit

  • CONFIG_TARGET_FOO was only used in board/sunxi/Makefile to select the
    dram config for sun5i and sun7i boards and in board/sunxi/gmac.c for some
    special handling of the bananapi/bananapro (both sun7i), all sun5i and sun7i
    boards have been moved over to using a single dram_sun5i_autoconfig file,
    and the tx clk delay handling for the Banana boards now has its own Kconfig.

    IOW nothing is using CONFIG_TARGET_FOO anymore, so remove it.

    Signed-off-by: Hans de Goede
    Acked-by: Ian Campbell

    Hans de Goede
     

23 Jan, 2015

1 commit

  • The qt840a is one of the many tv-boxes using the "i12" A20 pcb, but it
    populates only one of the 2 places for a 16 bit dram ic, thus reducing
    the buswidth to 16 bits, and the amount of ram to 512M, which is why we
    had a separate config for it.

    This commit switches the generic i12-tvbox_defconfig over to DRAM
    autoconfiguration, so that it will work with the qt840a too, and drops the
    qt840a specific config, like we've done with other memory-amount specific
    configs before.

    Tested on a generic i12-tvbox with 32 bit bus-width / 1G RAM, and on a
    qt840a with 16 bit bus-width / 512M RAM.

    Signed-off-by: Hans de Goede
    Acked-by: Ian Campbell

    Hans de Goede
     

05 Nov, 2014

3 commits

  • 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_ in pattern space
    P;D;
    };

    # Move CONFIG_TARGET_ to hold space
    /^CONFIG_TARGET/{h;n}

    # Print CONFIG_TARGET_ after CONFIG_MACH_ 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: Ian Campbell
    Reviewed-by: Hans de Goede
    Signed-off-by: Hans de Goede

    Ian Campbell
     
  • 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: Ian Campbell
    Reviewed-by: Hans de Goede
    Signed-off-by: Hans de Goede

    Ian Campbell
     
  • 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: Ian Campbell
    Reviewed-by: Hans de Goede
    Signed-off-by: Hans de Goede

    Ian Campbell