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

  • Currently we've separate detailed dram settings for all sun7i boards, this
    moves them over to using auto dram configuration so that we can get rid of
    all the per board dram_foo.c files.

    This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi,
    Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3.

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

    Hans de Goede
     

14 Jan, 2015

1 commit


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
     

24 Oct, 2014

1 commit

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

    Hans de Goede
     

05 Sep, 2014

2 commits


12 Aug, 2014

1 commit


31 Jul, 2014

1 commit